From 40b93cc26caf8ba3babdfcd3ec354a94d711204c Mon Sep 17 00:00:00 2001 From: arkon Date: Thu, 12 Oct 2023 22:43:03 -0400 Subject: [PATCH] Minor cleanup (cherry picked from commit 81448f5d01ba6c6fb69de10118519c1036c46965) --- .../kanade/tachiyomi/data/backup/BackupCreator.kt | 2 +- .../eu/kanade/tachiyomi/ui/main/MainActivity.kt | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreator.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreator.kt index 2c52b6d50..abae206b9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreator.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupCreator.kt @@ -294,7 +294,7 @@ class BackupCreator( private fun backupSourcePreferences(flags: Int): List { if (flags and BACKUP_SOURCE_PREFS_MASK != BACKUP_SOURCE_PREFS) return emptyList() - return sourceManager.getOnlineSources() + return sourceManager.getCatalogueSources() .filterIsInstance() .map { BackupSourcePreferences( diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 9969b16eb..cc1f2af4e 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -95,6 +95,7 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import logcat.LogPriority import tachiyomi.core.Constants +import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.system.logcat import tachiyomi.domain.UnsortedPreferences import tachiyomi.domain.library.service.LibraryPreferences @@ -337,7 +338,9 @@ class MainActivity : BaseActivity() { setSplashScreenExitAnimation(splashScreen) if (isLaunch && libraryPreferences.autoClearChapterCache().get()) { - chapterCache.clear() + lifecycleScope.launchIO { + chapterCache.clear() + } } // SY --> @@ -509,13 +512,13 @@ class MainActivity : BaseActivity() { // SY <-- companion object { - // Splash screen - private const val SPLASH_MIN_DURATION = 500 // ms - private const val SPLASH_MAX_DURATION = 5000 // ms - private const val SPLASH_EXIT_ANIM_DURATION = 400L // ms - const val INTENT_SEARCH = "eu.kanade.tachiyomi.SEARCH" const val INTENT_SEARCH_QUERY = "query" const val INTENT_SEARCH_FILTER = "filter" } } + +// Splash screen +private const val SPLASH_MIN_DURATION = 500 // ms +private const val SPLASH_MAX_DURATION = 5000 // ms +private const val SPLASH_EXIT_ANIM_DURATION = 400L // ms