Prevent multiple concurrent backups/restores

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupConst.kt

@@ -5,11 +5,11 @@ import eu.kanade.tachiyomi.BuildConfig.APPLICATION_ID as ID
 object BackupConst {
 
     const val INTENT_FILTER = "SettingsBackupFragment"
-    const val ACTION_BACKUP_COMPLETED_DIALOG = "$ID.$INTENT_FILTER.ACTION_BACKUP_COMPLETED_DIALOG"
-    const val ACTION_SET_PROGRESS_DIALOG = "$ID.$INTENT_FILTER.ACTION_SET_PROGRESS_DIALOG"
-    const val ACTION_ERROR_BACKUP_DIALOG = "$ID.$INTENT_FILTER.ACTION_ERROR_BACKUP_DIALOG"
-    const val ACTION_ERROR_RESTORE_DIALOG = "$ID.$INTENT_FILTER.ACTION_ERROR_RESTORE_DIALOG"
-    const val ACTION_RESTORE_COMPLETED_DIALOG = "$ID.$INTENT_FILTER.ACTION_RESTORE_COMPLETED_DIALOG"
+    const val ACTION_BACKUP_COMPLETED = "$ID.$INTENT_FILTER.ACTION_BACKUP_COMPLETED"
+    const val ACTION_BACKUP_ERROR = "$ID.$INTENT_FILTER.ACTION_BACKUP_ERROR"
+    const val ACTION_RESTORE_PROGRESS = "$ID.$INTENT_FILTER.ACTION_RESTORE_PROGRESS"
+    const val ACTION_RESTORE_COMPLETED = "$ID.$INTENT_FILTER.ACTION_RESTORE_COMPLETED"
+    const val ACTION_RESTORE_ERROR = "$ID.$INTENT_FILTER.ACTION_RESTORE_ERROR"
     const val ACTION = "$ID.$INTENT_FILTER.ACTION"
     const val EXTRA_PROGRESS = "$ID.$INTENT_FILTER.EXTRA_PROGRESS"
     const val EXTRA_AMOUNT = "$ID.$INTENT_FILTER.EXTRA_AMOUNT"

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupManager.kt

@@ -179,7 +179,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
 
                 // Show completed dialog
                 val intent = Intent(BackupConst.INTENT_FILTER).apply {
-                    putExtra(BackupConst.ACTION, BackupConst.ACTION_BACKUP_COMPLETED_DIALOG)
+                    putExtra(BackupConst.ACTION, BackupConst.ACTION_BACKUP_COMPLETED)
                     putExtra(BackupConst.EXTRA_URI, file.uri.toString())
                 }
                 context.sendLocalBroadcast(intent)
@@ -189,7 +189,7 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
             if (!isJob) {
                 // Show error dialog
                 val intent = Intent(BackupConst.INTENT_FILTER).apply {
-                    putExtra(BackupConst.ACTION, BackupConst.ACTION_ERROR_BACKUP_DIALOG)
+                    putExtra(BackupConst.ACTION, BackupConst.ACTION_BACKUP_ERROR)
                     putExtra(BackupConst.EXTRA_ERROR_MESSAGE, e.message)
                 }
                 context.sendLocalBroadcast(intent)

app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt

@@ -251,7 +251,7 @@ class BackupRestoreService : Service() {
                         putExtra(BackupConst.EXTRA_ERRORS, errors.size)
                         putExtra(BackupConst.EXTRA_ERROR_FILE_PATH, logFile.parent)
                         putExtra(BackupConst.EXTRA_ERROR_FILE, logFile.name)
-                        putExtra(BackupConst.ACTION, BackupConst.ACTION_RESTORE_COMPLETED_DIALOG)
+                        putExtra(BackupConst.ACTION, BackupConst.ACTION_RESTORE_COMPLETED)
                     }
                     sendLocalBroadcast(completeIntent)
                 }
@@ -259,7 +259,7 @@ class BackupRestoreService : Service() {
                     Timber.e(error)
                     writeErrorLog()
                     val errorIntent = Intent(BackupConst.INTENT_FILTER).apply {
-                        putExtra(BackupConst.ACTION, BackupConst.ACTION_ERROR_RESTORE_DIALOG)
+                        putExtra(BackupConst.ACTION, BackupConst.ACTION_RESTORE_ERROR)
                         putExtra(BackupConst.EXTRA_ERROR_MESSAGE, error.message)
                     }
                     sendLocalBroadcast(errorIntent)
@@ -463,7 +463,7 @@ class BackupRestoreService : Service() {
             putExtra(BackupConst.EXTRA_AMOUNT, amount)
             putExtra(BackupConst.EXTRA_CONTENT, content)
             putExtra(BackupConst.EXTRA_ERRORS, errors)
-            putExtra(BackupConst.ACTION, BackupConst.ACTION_SET_PROGRESS_DIALOG)
+            putExtra(BackupConst.ACTION, BackupConst.ACTION_RESTORE_PROGRESS)
         }
         sendLocalBroadcast(intent)
     }

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt

@@ -73,9 +73,13 @@ class SettingsBackupController : SettingsController() {
             summaryRes = R.string.pref_create_backup_summ
 
             onClick {
-                val ctrl = CreateBackupDialog()
-                ctrl.targetController = this@SettingsBackupController
-                ctrl.showDialog(router)
+                if (!isBackupStarted) {
+                    val ctrl = CreateBackupDialog()
+                    ctrl.targetController = this@SettingsBackupController
+                    ctrl.showDialog(router)
+                } else {
+                    context.toast(R.string.backup_in_progress)
+                }
             }
         }
         preference {
@@ -83,12 +87,16 @@ class SettingsBackupController : SettingsController() {
             summaryRes = R.string.pref_restore_backup_summ
 
             onClick {
-                val intent = Intent(Intent.ACTION_GET_CONTENT)
-                intent.addCategory(Intent.CATEGORY_OPENABLE)
-                intent.type = "application/*"
-                val title = resources?.getString(R.string.file_select_backup)
-                val chooser = Intent.createChooser(intent, title)
-                startActivityForResult(chooser, CODE_BACKUP_RESTORE)
+                if (!isRestoreStarted) {
+                    val intent = Intent(Intent.ACTION_GET_CONTENT)
+                    intent.addCategory(Intent.CATEGORY_OPENABLE)
+                    intent.type = "application/*"
+                    val title = resources?.getString(R.string.file_select_backup)
+                    val chooser = Intent.createChooser(intent, title)
+                    startActivityForResult(chooser, CODE_BACKUP_RESTORE)
+                } else {
+                    context.toast(R.string.restore_in_progress)
+                }
             }
         }
         preferenceCategory {
@@ -183,6 +191,8 @@ class SettingsBackupController : SettingsController() {
                 notifier.showBackupProgress()
 
                 BackupCreateService.makeBackup(activity, file.uri, backupFlags)
+
+                isBackupStarted = true
             }
             CODE_BACKUP_RESTORE -> if (data != null && resultCode == Activity.RESULT_OK) {
                 val uri = data.data
@@ -260,6 +270,8 @@ class SettingsBackupController : SettingsController() {
                         if (context != null) {
                             RestoringBackupDialog().showDialog(router, TAG_RESTORING_BACKUP_DIALOG)
                             BackupRestoreService.start(context, args.getParcelable(KEY_URI)!!)
+
+                            isRestoreStarted = true
                         }
                     }
                     .build()
@@ -308,22 +320,28 @@ class SettingsBackupController : SettingsController() {
     inner class BackupBroadcastReceiver : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
             when (intent.getStringExtra(BackupConst.ACTION)) {
-                BackupConst.ACTION_BACKUP_COMPLETED_DIALOG -> {
+                BackupConst.ACTION_BACKUP_COMPLETED -> {
+                    isBackupStarted = false
+
                     val uri = Uri.parse(intent.getStringExtra(BackupConst.EXTRA_URI))
                     val unifile = UniFile.fromUri(activity, uri)
                     notifier.showBackupComplete(unifile)
                 }
-                BackupConst.ACTION_ERROR_BACKUP_DIALOG -> {
+                BackupConst.ACTION_BACKUP_ERROR -> {
+                    isBackupStarted = false
+
                     notifier.showBackupError(intent.getStringExtra(BackupConst.EXTRA_ERROR_MESSAGE))
                 }
-                BackupConst.ACTION_SET_PROGRESS_DIALOG -> {
+                BackupConst.ACTION_RESTORE_PROGRESS -> {
                     val progress = intent.getIntExtra(BackupConst.EXTRA_PROGRESS, 0)
                     val amount = intent.getIntExtra(BackupConst.EXTRA_AMOUNT, 0)
                     val content = intent.getStringExtra(BackupConst.EXTRA_CONTENT)
                     (router.getControllerWithTag(TAG_RESTORING_BACKUP_DIALOG)
                             as? RestoringBackupDialog)?.updateProgress(content, progress, amount)
                 }
-                BackupConst.ACTION_RESTORE_COMPLETED_DIALOG -> {
+                BackupConst.ACTION_RESTORE_COMPLETED -> {
+                    isRestoreStarted = false
+
                     router.popControllerWithTag(TAG_RESTORING_BACKUP_DIALOG)
                     val time = intent.getLongExtra(BackupConst.EXTRA_TIME, 0)
                     val errorCount = intent.getIntExtra(BackupConst.EXTRA_ERRORS, 0)
@@ -331,7 +349,9 @@ class SettingsBackupController : SettingsController() {
                     val file = intent.getStringExtra(BackupConst.EXTRA_ERROR_FILE)
                     notifier.showRestoreComplete(time, errorCount, path, file)
                 }
-                BackupConst.ACTION_ERROR_RESTORE_DIALOG -> {
+                BackupConst.ACTION_RESTORE_ERROR -> {
+                    isRestoreStarted = false
+
                     router.popControllerWithTag(TAG_RESTORING_BACKUP_DIALOG)
                     notifier.showRestoreError(intent.getStringExtra(BackupConst.EXTRA_ERROR_MESSAGE))
                 }
@@ -345,5 +365,8 @@ class SettingsBackupController : SettingsController() {
         const val CODE_BACKUP_DIR = 503
 
         const val TAG_RESTORING_BACKUP_DIALOG = "RestoringBackupDialog"
+
+        var isBackupStarted = false
+        var isRestoreStarted = false
     }
 }

app/src/main/res/values/strings.xml

@@ -323,9 +323,11 @@
     <string name="restore_completed_content">Restore took %1$s with %2$s errors</string>
     <string name="backup_restore_content">Restore uses sources to fetch data, carrier costs may apply.\n\nMake sure you have installed all necessary extensions and are logged in to sources and tracking services before restoring.</string>
     <string name="file_saved">File saved at %1$s</string>
+    <string name="backup_in_progress">Backup is already in progress</string>
     <string name="backup_choice">What do you want to backup?</string>
     <string name="creating_backup">Creating backup</string>
     <string name="creating_backup_error">Backup failed</string>
+    <string name="restore_in_progress">Restore is already in progress</string>
     <string name="restoring_backup">Restoring backup</string>
     <string name="restoring_backup_error">Restoring backup failed</string>