From 21346eefe267d93fe020ed4800cca502e23f1432 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Thu, 2 Dec 2021 20:54:54 -0500 Subject: [PATCH] Minor lint fixes --- .../kanade/tachiyomi/data/preference/PreferencesHelper.kt | 2 -- .../java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt | 4 ++-- app/src/main/java/exh/md/handlers/FilterHandler.kt | 1 + app/src/main/java/exh/md/handlers/MangaHandler.kt | 6 +++--- app/src/main/java/exh/ui/intercept/InterceptActivity.kt | 2 ++ 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index 188d7dea8..5c39ec74b 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -473,8 +473,6 @@ class PreferencesHelper(val context: Context) { fun useNewSourceNavigation() = flowPrefs.getBoolean(Keys.useNewSourceNavigation, true) - fun mangaDexForceLatestCovers() = flowPrefs.getBoolean(Keys.mangaDexForceLatestCovers, false) - fun preferredMangaDexId() = flowPrefs.getString(Keys.preferredMangaDexId, "0") fun mangadexSyncToLibraryIndexes() = flowPrefs.getStringSet(Keys.mangadexSyncToLibraryIndexes, emptySet()) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt index e53796f91..7b4802589 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt @@ -167,11 +167,11 @@ class MangaDex(delegate: HttpSource, val context: Context) : } override fun fetchMangaDetails(manga: SManga): Observable { - return mangaHandler.fetchMangaDetailsObservable(manga, id, preferences.mangaDexForceLatestCovers().get()) + return mangaHandler.fetchMangaDetailsObservable(manga, id) } override suspend fun getMangaDetails(manga: MangaInfo): MangaInfo { - return mangaHandler.getMangaDetails(manga, id, preferences.mangaDexForceLatestCovers().get()) + return mangaHandler.getMangaDetails(manga, id) } override fun fetchChapterList(manga: SManga): Observable> { diff --git a/app/src/main/java/exh/md/handlers/FilterHandler.kt b/app/src/main/java/exh/md/handlers/FilterHandler.kt index cd378c7e0..7770815eb 100644 --- a/app/src/main/java/exh/md/handlers/FilterHandler.kt +++ b/app/src/main/java/exh/md/handlers/FilterHandler.kt @@ -229,6 +229,7 @@ class FilterHandler { is TagExclusionMode -> { queryMap["excludedTagsMode"] = filter.values[filter.state].uppercase(Locale.US) } + else -> Unit } } if (originalLanguageList.isNotEmpty()) { diff --git a/app/src/main/java/exh/md/handlers/MangaHandler.kt b/app/src/main/java/exh/md/handlers/MangaHandler.kt index d05f4038f..05badd417 100644 --- a/app/src/main/java/exh/md/handlers/MangaHandler.kt +++ b/app/src/main/java/exh/md/handlers/MangaHandler.kt @@ -26,15 +26,15 @@ class MangaHandler( private val apiMangaParser: ApiMangaParser, private val followsHandler: FollowsHandler ) { - suspend fun getMangaDetails(manga: MangaInfo, sourceId: Long, forceLatestCovers: Boolean): MangaInfo { + suspend fun getMangaDetails(manga: MangaInfo, sourceId: Long): MangaInfo { val response = withIOContext { service.viewManga(MdUtil.getMangaId(manga.key)) } val simpleChapters = withIOContext { getSimpleChapters(manga) } return apiMangaParser.parseToManga(manga, response, simpleChapters, sourceId) } - fun fetchMangaDetailsObservable(manga: SManga, sourceId: Long, forceLatestCovers: Boolean): Observable { + fun fetchMangaDetailsObservable(manga: SManga, sourceId: Long): Observable { return runAsObservable { - getMangaDetails(manga.toMangaInfo(), sourceId, forceLatestCovers).toSManga() + getMangaDetails(manga.toMangaInfo(), sourceId).toSManga() } } diff --git a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt index 090df62d8..33c8f9668 100755 --- a/app/src/main/java/exh/ui/intercept/InterceptActivity.kt +++ b/app/src/main/java/exh/ui/intercept/InterceptActivity.kt @@ -88,6 +88,8 @@ class InterceptActivity : BaseViewBindingActivity() .setOnDismissListener { onBackPressed() } .show() } + InterceptResult.Idle -> Unit + InterceptResult.Loading -> Unit } } .launchIn(lifecycleScope)