feat: Do not reset list if operation failed

Change-Id: I21fb87a344e7df245795e01b75328b533dd83ee3
XayahSuSuSu · Jan 9, 2025 · e259323 · e259323
1 parent c2d95e2
commit e259323
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/...ore/service/src/main/kotlin/com/xayah/core/service/medium/backup/AbstractBackupService.kt b/...ore/service/src/main/kotlin/com/xayah/core/service/medium/backup/AbstractBackupService.kt
@@ -202,7 +202,9 @@ internal abstract class AbstractBackupService : AbstractMediumService() {
                 }
                 entity.update(progress = 0.5f)
 
-                if (mContext.readResetBackupList().first()) mMediaDao.clearActivated(OpType.BACKUP)
+                if (mContext.readResetBackupList().first() && mTaskEntity.failureCount == 0) {
+                    mMediaDao.clearActivated(OpType.BACKUP)
+                }
                 if (runCatchingOnService { clear() }.not()) {
                     isSuccess = false
                 }

diff --git a/...e/service/src/main/kotlin/com/xayah/core/service/medium/restore/AbstractRestoreService.kt b/...e/service/src/main/kotlin/com/xayah/core/service/medium/restore/AbstractRestoreService.kt
@@ -126,7 +126,9 @@ internal abstract class AbstractRestoreService : AbstractMediumService() {
                     mContext.getString(R.string.wait_for_remaining_data_processing)
                 )
 
-                if (mContext.readResetRestoreList().first()) mMediaDao.clearActivated(OpType.RESTORE)
+                if (mContext.readResetRestoreList().first() && mTaskEntity.failureCount == 0) {
+                    mMediaDao.clearActivated(OpType.RESTORE)
+                }
                 val isSuccess = runCatchingOnService { clear() }
                 entity.update(progress = 1f, state = if (isSuccess) OperationState.DONE else OperationState.ERROR)
             }

diff --git a/...e/service/src/main/kotlin/com/xayah/core/service/packages/backup/AbstractBackupService.kt b/...e/service/src/main/kotlin/com/xayah/core/service/packages/backup/AbstractBackupService.kt
@@ -278,7 +278,9 @@ internal abstract class AbstractBackupService : AbstractPackagesService() {
                 } else {
                     log { "AccessibilityServices is empty, skip restoring." }
                 }
-                if (mContext.readResetBackupList().first()) mPackageDao.clearActivated(OpType.BACKUP)
+                if (mContext.readResetBackupList().first() && mTaskEntity.failureCount == 0) {
+                    mPackageDao.clearActivated(OpType.BACKUP)
+                }
                 if (runCatchingOnService { clear() }.not()) {
                     isSuccess = false
                 }

diff --git a/...service/src/main/kotlin/com/xayah/core/service/packages/restore/AbstractRestoreService.kt b/...service/src/main/kotlin/com/xayah/core/service/packages/restore/AbstractRestoreService.kt
@@ -165,7 +165,9 @@ internal abstract class AbstractRestoreService : AbstractPackagesService() {
                     mContext.getString(R.string.wait_for_remaining_data_processing)
                 )
 
-                if (mContext.readResetRestoreList().first()) mPackageDao.clearActivated(OpType.RESTORE)
+                if (mContext.readResetRestoreList().first() && mTaskEntity.failureCount == 0) {
+                    mPackageDao.clearActivated(OpType.RESTORE)
+                }
                 val isSuccess = runCatchingOnService { clear() }
                 entity.update(progress = 1f, state = if (isSuccess) OperationState.DONE else OperationState.ERROR)
             }