From f93d21774f167774b8c98cdcf28400a97cf99e41 Mon Sep 17 00:00:00 2001 From: arkon Date: Tue, 9 Feb 2021 19:14:38 -0500 Subject: [PATCH] Adjust some scopes (cherry picked from commit 2a454b44ccd32c3108044e94c6b26fc76b0b9427) --- .../java/eu/kanade/tachiyomi/data/download/Downloader.kt | 6 +++--- .../kanade/tachiyomi/data/library/LibraryUpdateService.kt | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt b/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt index 4b0cf7ac2..a7e24571e 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt @@ -17,8 +17,8 @@ import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.fetchAllImageUrlsFromPageList import eu.kanade.tachiyomi.util.lang.RetryWithDelay +import eu.kanade.tachiyomi.util.lang.launchIO import eu.kanade.tachiyomi.util.lang.launchNow -import eu.kanade.tachiyomi.util.lang.launchUI import eu.kanade.tachiyomi.util.lang.plusAssign import eu.kanade.tachiyomi.util.storage.DiskUtil import eu.kanade.tachiyomi.util.storage.saveTo @@ -235,8 +235,8 @@ class Downloader( * @param chapters the list of chapters to download. * @param autoStart whether to start the downloader after enqueing the chapters. */ - fun queueChapters(manga: Manga, chapters: List, autoStart: Boolean) = launchUI { - val source = sourceManager.get(manga.source) as? HttpSource ?: return@launchUI + fun queueChapters(manga: Manga, chapters: List, autoStart: Boolean) = launchIO { + val source = sourceManager.get(manga.source) as? HttpSource ?: return@launchIO val wasEmpty = queue.isEmpty() // Called in background thread, the operation can be slow with SAF. val chaptersWithoutDir = async { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt index a4362d028..e19121815 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt @@ -51,6 +51,7 @@ import exh.util.nullIfBlank import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.async @@ -421,7 +422,7 @@ class LibraryUpdateService( val handler = CoroutineExceptionHandler { _, exception -> Timber.e(exception) } - ioScope.launch(handler) { + GlobalScope.launch(Dispatchers.IO + handler) { val updatedManga = source.getMangaDetails(manga.toMangaInfo()) val sManga = updatedManga.toSManga() // Avoid "losing" existing cover