Cancel ongoing notification as soon as possible in case system kills …

…us fast
seedvault-app · Jun 19, 2024 · 3061dcc · 3061dcc
1 parent 22ca255
commit 3061dcc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/notification/BackupNotificationManager.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/notification/BackupNotificationManager.kt
@@ -107,6 +107,8 @@ internal class BackupNotificationManager(private val context: Context) {
         nm.cancel(NOTIFICATION_ID_OBSERVER)
     }
 
+    fun cancelObserverNotification() = this::onApkBackupDone
+
     /**
      * Call this right after starting a backup.
      */

diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/notification/NotificationBackupObserver.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/notification/NotificationBackupObserver.kt
@@ -120,6 +120,9 @@ internal class NotificationBackupObserver(
      *   as a whole failed.
      */
     override fun backupFinished(status: Int) {
+        // cancel ongoing notification as first thing because system may kill us any millisecond
+        if (!backupRequester.hasNext()) nm.cancelObserverNotification()
+
         if (status == ERROR_BACKUP_CANCELLED) {
             val packageName = errorPackageName
             if (packageName == null) {

diff --git a/app/src/main/java/com/stevesoltys/seedvault/worker/BackupRequester.kt b/app/src/main/java/com/stevesoltys/seedvault/worker/BackupRequester.kt
@@ -79,6 +79,8 @@ internal class BackupRequester(
         }
     }
 
+    fun hasNext(): Boolean = packageIndex < packages.size
+
     private fun request(chunk: Array<String>): Boolean {
         Log.i(TAG, "${chunk.toList()}")
         val result = try {