From 75162fbfe7fd7fb69fd6ce9e8a5a0cf85deb609c Mon Sep 17 00:00:00 2001 From: KaiserBh Date: Wed, 11 Oct 2023 23:25:24 +1100 Subject: [PATCH] refactor: Use the new class backupCreator and backupRestorer instead of BackupManager. Signed-off-by: KaiserBh --- .../eu/kanade/tachiyomi/data/sync/SyncManager.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt index 49312fb7d..0be252c86 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/sync/SyncManager.kt @@ -4,9 +4,10 @@ import android.content.Context import android.net.Uri import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.backup.BackupConst.BACKUP_ALL -import eu.kanade.tachiyomi.data.backup.BackupManager +import eu.kanade.tachiyomi.data.backup.BackupCreator import eu.kanade.tachiyomi.data.backup.BackupNotifier import eu.kanade.tachiyomi.data.backup.BackupRestoreJob +import eu.kanade.tachiyomi.data.backup.BackupRestorer import eu.kanade.tachiyomi.data.backup.models.Backup import eu.kanade.tachiyomi.data.backup.models.BackupChapter import eu.kanade.tachiyomi.data.backup.models.BackupManga @@ -50,9 +51,10 @@ class SyncManager( private val getFavorites: GetFavorites = Injekt.get(), private val getCategories: GetCategories = Injekt.get(), ) { - private val backupManager: BackupManager = BackupManager(context) + private val backupCreator: BackupCreator = BackupCreator(context) private val notifier: SyncNotifier = SyncNotifier(context) private val backupNotify: BackupNotifier = BackupNotifier(context) + private val backupRestorer: BackupRestorer = BackupRestorer(context, backupNotify) enum class SyncService(val value: Int) { NONE(0), @@ -74,10 +76,12 @@ class SyncManager( suspend fun syncData() { val databaseManga = getAllMangaFromDB() val backup = Backup( - backupManager.backupMangas(databaseManga, BACKUP_ALL), - backupManager.backupCategories(BACKUP_ALL), + backupCreator.backupMangas(databaseManga, BACKUP_ALL), + backupCreator.backupCategories(BACKUP_ALL), emptyList(), - backupManager.prepExtensionInfoForSync(databaseManga), + backupCreator.prepExtensionInfoForSync(databaseManga), + backupCreator.backupAppPreferences(BACKUP_ALL), + backupCreator.backupSourcePreferences(BACKUP_ALL), ) // Create the SyncStatus object @@ -265,7 +269,7 @@ class SyncManager( localMangaMap[nonFavorite.url]?.let { localManga -> if (localManga.favorite != nonFavorite.favorite) { val updatedManga = localManga.copy(favorite = nonFavorite.favorite) - backupManager.updateManga(updatedManga) + backupRestorer.updateManga(updatedManga) } } }