From 211ea5ab4cabcd2cb1d1dd890dc0196b442f017b Mon Sep 17 00:00:00 2001 From: KaiserBh Date: Sat, 15 Jul 2023 01:35:04 +1000 Subject: [PATCH] refactor: Use URI SyncHolder.kt not needed anymore. --- .../tachiyomi/data/backup/BackupRestoreJob.kt | 14 ++------------ .../kanade/tachiyomi/data/backup/BackupRestorer.kt | 7 +------ .../eu/kanade/tachiyomi/data/sync/SyncHolder.kt | 7 ------- 3 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncHolder.kt diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreJob.kt index 04857d0914..4f1c45bc29 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreJob.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreJob.kt @@ -11,7 +11,6 @@ import androidx.work.WorkerParameters import androidx.work.workDataOf import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.notification.Notifications -import eu.kanade.tachiyomi.data.sync.SyncHolder import eu.kanade.tachiyomi.util.system.cancelNotification import eu.kanade.tachiyomi.util.system.isRunning import eu.kanade.tachiyomi.util.system.workManager @@ -28,7 +27,6 @@ class BackupRestoreJob(private val context: Context, workerParams: WorkerParamet val uri = inputData.getString(LOCATION_URI_KEY)?.toUri() ?: return Result.failure() val sync = inputData.getBoolean(SYNC, false) - val useBackupHolder = inputData.getBoolean(USE_BACKUP_HOLDER, false) try { setForeground(getForegroundInfo()) @@ -38,12 +36,7 @@ class BackupRestoreJob(private val context: Context, workerParams: WorkerParamet return try { val restorer = BackupRestorer(context, notifier) - if (useBackupHolder) { - restorer.syncFromBackup(uri, sync) - SyncHolder.backup = null - } else { - restorer.syncFromBackup(uri, sync) - } + restorer.syncFromBackup(uri, sync) Result.success() } catch (e: Exception) { if (e is CancellationException) { @@ -71,11 +64,10 @@ class BackupRestoreJob(private val context: Context, workerParams: WorkerParamet return context.workManager.isRunning(TAG) } - fun start(context: Context, uri: Uri, sync: Boolean = false, useBackupHolder: Boolean = false) { + fun start(context: Context, uri: Uri, sync: Boolean = false) { val inputData = workDataOf( LOCATION_URI_KEY to uri.toString(), SYNC to sync, - USE_BACKUP_HOLDER to useBackupHolder, ) val request = OneTimeWorkRequestBuilder() .addTag(TAG) @@ -95,5 +87,3 @@ private const val TAG = "BackupRestore" private const val LOCATION_URI_KEY = "location_uri" // String private const val SYNC = "sync" // Boolean - -private const val USE_BACKUP_HOLDER = "use_backup_holder" // Boolean diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt index b6b0145e9c..cb4d9a5801 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestorer.kt @@ -7,7 +7,6 @@ import eu.kanade.tachiyomi.data.backup.models.BackupCategory import eu.kanade.tachiyomi.data.backup.models.BackupHistory import eu.kanade.tachiyomi.data.backup.models.BackupManga import eu.kanade.tachiyomi.data.backup.models.BackupSource -import eu.kanade.tachiyomi.data.sync.SyncHolder import eu.kanade.tachiyomi.util.BackupUtil import eu.kanade.tachiyomi.util.system.createFileInCacheDir import kotlinx.coroutines.coroutineScope @@ -79,11 +78,7 @@ class BackupRestorer( } private suspend fun performRestore(uri: Uri, sync: Boolean): Boolean { - val backup = if (sync) { - SyncHolder.backup ?: throw IllegalStateException("syncBackup cannot be null when sync is true") - } else { - BackupUtil.decodeBackup(context, uri) - } + val backup = BackupUtil.decodeBackup(context, uri) restoreAmount = backup.backupManga.size + 1 // +1 for categories diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncHolder.kt deleted file mode 100644 index 3cd618e5af..0000000000 --- a/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncHolder.kt +++ /dev/null @@ -1,7 +0,0 @@ -package eu.kanade.tachiyomi.data.sync - -import eu.kanade.tachiyomi.data.backup.models.Backup - -object SyncHolder { - var backup: Backup? = null -}