From 5af56fb51ef2fda6509b6417d82b33c07405efd7 Mon Sep 17 00:00:00 2001 From: Roshan Varughese <40583749+Animeboynz@users.noreply.github.com> Date: Tue, 15 Oct 2024 01:52:06 +1300 Subject: [PATCH] Double awaitList --- .../kanade/tachiyomi/data/backup/create/BackupCreator.kt | 7 +++---- .../kanade/tachiyomi/data/backup/create/BackupOptions.kt | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt index 5d4cb4022..de00e2b37 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupCreator.kt @@ -24,11 +24,10 @@ import okio.gzip import okio.sink import tachiyomi.core.common.i18n.stringResource import tachiyomi.core.common.util.system.logcat -import tachiyomi.data.DatabaseHandler -import tachiyomi.data.manga.MangaMapper import tachiyomi.domain.backup.service.BackupPreferences import tachiyomi.domain.manga.interactor.GetFavorites import tachiyomi.domain.manga.model.Manga +import tachiyomi.domain.manga.repository.MangaRepository import tachiyomi.i18n.MR import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get @@ -45,7 +44,7 @@ class BackupCreator( private val parser: ProtoBuf = Injekt.get(), private val getFavorites: GetFavorites = Injekt.get(), private val backupPreferences: BackupPreferences = Injekt.get(), - private val handler: DatabaseHandler = Injekt.get(), + private val mangaRepository: MangaRepository = Injekt.get(), private val categoriesBackupCreator: CategoriesBackupCreator = CategoriesBackupCreator(), private val mangaBackupCreator: MangaBackupCreator = MangaBackupCreator(), @@ -81,7 +80,7 @@ class BackupCreator( val backupManga = backupMangas( getFavorites.await() + if (options.readEntries) { - handler.awaitList { mangasQueries.getReadMangaNotInLibrary(MangaMapper::mapManga) } + mangaRepository.getReadMangaNotInLibrary() } else { emptyList() }, diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt index b500ac6d9..e24e647a9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/create/BackupOptions.kt @@ -30,7 +30,8 @@ data class BackupOptions( privateSettings, ) - fun canCreate() = libraryEntries || categories || readEntries || appSettings || extensionRepoSettings || sourceSettings + fun canCreate() = + libraryEntries || categories || readEntries || appSettings || extensionRepoSettings || sourceSettings companion object { val libraryOptions = persistentListOf(