fixing infinite loader

Author: Razeeman

features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/viewModel/ChangeRunningRecordViewModel.kt

@@ -41,7 +41,6 @@ import com.example.util.simpletimetracker.navigation.params.screen.ChangeRunning
 import com.example.util.simpletimetracker.navigation.params.screen.ChangeTagData
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
@@ -248,8 +247,8 @@ class ChangeRunningRecordViewModel @Inject constructor(
     }
 
     private fun startUpdate() {
+        timerJob?.cancel()
         timerJob = viewModelScope.launch {
-            timerJob?.cancelAndJoin()
             while (isActive) {
                 updatePreview()
                 // Update split preview only if it is visible
@@ -262,9 +261,7 @@ class ChangeRunningRecordViewModel @Inject constructor(
     }
 
     private fun stopUpdate() {
-        viewModelScope.launch {
-            timerJob?.cancelAndJoin()
-        }
+        timerJob?.cancel()
     }
 
     companion object {

features/feature_goals/src/main/java/com/example/util/simpletimetracker/feature_goals/viewModel/GoalsViewModel.kt

@@ -25,7 +25,6 @@ import com.example.util.simpletimetracker.navigation.params.screen.DateTimeDialo
 import com.example.util.simpletimetracker.navigation.params.screen.DateTimeDialogType
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
@@ -140,8 +139,8 @@ class GoalsViewModel @Inject constructor(
     }
 
     private fun startUpdate() {
+        timerJob?.cancel()
         timerJob = viewModelScope.launch {
-            timerJob?.cancelAndJoin()
             while (isActive) {
                 updateStatistics()
                 delay(TIMER_UPDATE)
@@ -150,9 +149,7 @@ class GoalsViewModel @Inject constructor(
     }
 
     private fun stopUpdate() {
-        viewModelScope.launch {
-            timerJob?.cancelAndJoin()
-        }
+        timerJob?.cancel()
     }
 
     private fun updatePosition(newPosition: Int) {

features/feature_pomodoro/src/main/java/com/example/util/simpletimetracker/feature_pomodoro/timer/viewModel/PomodoroViewModel.kt

@@ -20,7 +20,6 @@ import com.example.util.simpletimetracker.navigation.Router
 import com.example.util.simpletimetracker.navigation.params.screen.PomodoroSettingsParams
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
@@ -96,8 +95,8 @@ class PomodoroViewModel @Inject constructor(
     }
 
     private fun startUpdate() {
+        timerJob?.cancel()
         timerJob = viewModelScope.launch {
-            timerJob?.cancelAndJoin()
             while (isActive) {
                 updateButtonState()
                 updateTimerState()
@@ -107,9 +106,7 @@ class PomodoroViewModel @Inject constructor(
     }
 
     private fun stopUpdate() {
-        viewModelScope.launch {
-            timerJob?.cancelAndJoin()
-        }
+        timerJob?.cancel()
     }
 
     private suspend fun updateButtonState() {

features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/viewModel/RecordsViewModel.kt

@@ -38,7 +38,6 @@ import com.example.util.simpletimetracker.navigation.params.screen.ChangeRunning
 import com.example.util.simpletimetracker.navigation.params.screen.RecordQuickActionsParams
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
@@ -221,11 +220,7 @@ class RecordsViewModel @Inject constructor(
 
     fun onVisible() {
         isVisible = true
-        if (shift == 0) {
-            startUpdate()
-        } else {
-            updateRecords()
-        }
+        startUpdate()
     }
 
     fun onHidden() {
@@ -349,8 +344,12 @@ class RecordsViewModel @Inject constructor(
     }
 
     private fun startUpdate() {
+        timerJob?.cancel()
+        if (shift != 0) {
+            updateRecords()
+            return
+        }
         timerJob = viewModelScope.launch {
-            timerJob?.cancelAndJoin()
             while (isActive) {
                 updateRecords()
                 delay(TIMER_UPDATE)
@@ -359,9 +358,7 @@ class RecordsViewModel @Inject constructor(
     }
 
     private fun stopUpdate() {
-        viewModelScope.launch {
-            timerJob?.cancelAndJoin()
-        }
+        timerJob?.cancel()
     }
 
     companion object {

features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/viewModel/RunningRecordsViewModel.kt

@@ -52,7 +52,6 @@ import com.example.util.simpletimetracker.navigation.params.screen.RecordTagSele
 import com.example.util.simpletimetracker.navigation.params.screen.StandardDialogParams
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
@@ -545,8 +544,8 @@ class RunningRecordsViewModel @Inject constructor(
     }
 
     private fun startUpdate() {
+        timerJob?.cancel()
         timerJob = viewModelScope.launch {
-            timerJob?.cancelAndJoin()
             delayLoad()
             while (isActive) {
                 updateRunningRecords()
@@ -556,9 +555,7 @@ class RunningRecordsViewModel @Inject constructor(
     }
 
     private fun stopUpdate() {
-        viewModelScope.launch {
-            timerJob?.cancelAndJoin()
-        }
+        timerJob?.cancel()
     }
 
     @Parcelize

features/feature_statistics/src/main/java/com/example/util/simpletimetracker/feature_statistics/viewModel/StatisticsViewModel.kt

@@ -25,7 +25,6 @@ import com.example.util.simpletimetracker.navigation.Router
 import com.example.util.simpletimetracker.navigation.params.screen.ChartFilterDialogParams
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
@@ -66,11 +65,7 @@ class StatisticsViewModel @Inject constructor(
 
     fun onVisible() {
         isVisible = true
-        if (shift == 0) {
-            startUpdate()
-        } else {
-            updateStatistics()
-        }
+        startUpdate()
         updateAnimateChartParticles()
     }
 
@@ -221,8 +216,12 @@ class StatisticsViewModel @Inject constructor(
     }
 
     private fun startUpdate() {
+        timerJob?.cancel()
+        if (shift != 0) {
+            updateStatistics()
+            return
+        }
         timerJob = viewModelScope.launch {
-            timerJob?.cancelAndJoin()
             while (isActive) {
                 updateStatistics()
                 delay(TIMER_UPDATE)
@@ -231,9 +230,7 @@ class StatisticsViewModel @Inject constructor(
     }
 
     private fun stopUpdate() {
-        viewModelScope.launch {
-            timerJob?.cancelAndJoin()
-        }
+        timerJob?.cancel()
     }
 
     companion object {