From 7006341fabefaaabe3f20fb5c5881af609d2054a Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sat, 9 Jan 2021 15:16:23 -0500 Subject: [PATCH] Cleanup --- .../advanced/process/MigrationListController.kt | 17 +++++++++++------ .../tachiyomi/ui/reader/ReaderActivity.kt | 3 ++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt index 8df0f110a..5eaf72f13 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt @@ -171,12 +171,17 @@ class MigrationListController(bundle: Bundle? = null) : } if (searchResult != null && !(searchResult.url == mangaObj.url && source.id == mangaObj.source)) { - val localManga = - smartSearchEngine.networkToLocalManga( - searchResult, - source.id - ) - val chapters = (if (source is EHentai) source.getChapterList(localManga.toMangaInfo(), throttleManager::throttle) else source.getChapterList(localManga.toMangaInfo())) + val localManga = smartSearchEngine.networkToLocalManga( + searchResult, + source.id + ) + + val chapters = if (source is EHentai) { + source.getChapterList(localManga.toMangaInfo(), throttleManager::throttle) + } else { + source.getChapterList(localManga.toMangaInfo()) + } + try { syncChaptersWithSource(db, chapters.map { it.toSChapter() }, localManga, source) } catch (e: Exception) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 47dda7f4b..06e08791a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -70,6 +70,7 @@ import eu.kanade.tachiyomi.util.view.showBar import eu.kanade.tachiyomi.util.view.snack import eu.kanade.tachiyomi.widget.SimpleAnimationListener import eu.kanade.tachiyomi.widget.SimpleSeekBarListener +import exh.isEhBasedSource import exh.util.defaultReaderType import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -499,7 +500,7 @@ class ReaderActivity : BaseRxActivity() // If we are using EHentai/ExHentai, get a new image URL presenter.manga?.let { m -> val src = sourceManager.get(m.source) - if (src is EHentai) { + if (src?.isEhBasedSource() == true) { page.imageUrl = null } }