Cancel the worker scope LAST, and log better.

d4rken-org · Dec 2, 2023 · 60fc360 · 60fc360
1 parent b96668b
commit 60fc360
Showing 1 changed file with 10 additions and 2 deletions.
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
@@ -108,10 +108,18 @@ class SchedulerWorker @AssistedInject constructor(
     } finally {
         try {
             schedulerNotifications.cancel(scheduleId)
-            workerScope.cancel("Worker finished (withError?=$finishedWithError).")
             schedulerManager.reschedule(scheduleId)
         } catch (e: Exception) {
-            log(TAG, ERROR) { "Failed to clean up after scheduled work (error=$finishedWithError): ${e.asLog()}" }
+            log(
+                TAG,
+                ERROR
+            ) { "Failed to clean up notifications and reschedule (error=$finishedWithError): ${e.asLog()}" }
+        }
+
+        try {
+            workerScope.cancel("Worker finished (withError?=$finishedWithError).")
+        } catch (e: Exception) {
+            log(TAG, ERROR) { "Failed to cancel worker scope (error=$finishedWithError): ${e.asLog()}" }
         }
     }