Scheduler: Tweak rescheduling behavior

See #692
d4rken-org · Nov 28, 2023 · 6979752 · 6979752
1 parent cf080e0
commit 6979752
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/src/main/java/eu/darken/sdmse/scheduler/core/SchedulerManager.kt b/app/src/main/java/eu/darken/sdmse/scheduler/core/SchedulerManager.kt
@@ -154,7 +154,7 @@ class SchedulerManager @Inject constructor(
 
         workManager.enqueueUniqueWork(
             workName,
-            if (reschedule) ExistingWorkPolicy.APPEND else ExistingWorkPolicy.REPLACE,
+            if (reschedule) ExistingWorkPolicy.APPEND_OR_REPLACE else ExistingWorkPolicy.REPLACE,
             workRequest
         ).await()
 

diff --git a/app/src/main/java/eu/darken/sdmse/scheduler/core/SchedulerWorker.kt b/app/src/main/java/eu/darken/sdmse/scheduler/core/SchedulerWorker.kt
@@ -84,8 +84,6 @@ class SchedulerWorker @AssistedInject constructor(
         val duration = System.currentTimeMillis() - start
         log(TAG, INFO) { "Execution finished after ${duration}ms: $schedule" }
 
-        schedulerManager.reschedule(scheduleId)
-
         Result.success(inputData)
     } catch (e: Throwable) {
         if (e !is CancellationException) {
@@ -99,6 +97,7 @@ class SchedulerWorker @AssistedInject constructor(
     } finally {
         schedulerNotifications.cancel(scheduleId)
         workerScope.cancel("Worker finished (withError?=$finishedWithError).")
+        schedulerManager.reschedule(scheduleId)
     }
 
     private suspend fun doDoWork(schedule: Schedule) {