From 9cc7d42dd9676319559eddc7a4a264fca155e1ca Mon Sep 17 00:00:00 2001 From: Roshan Varughese <40583749+Animeboynz@users.noreply.github.com> Date: Tue, 17 Sep 2024 20:47:04 +1200 Subject: [PATCH] Re-enable fetching chapters list for entries with licenced status (#1230) Enable Licensed --- .../presentation/util/ExceptionFormatter.kt | 2 -- .../moko-resources/base/strings.xml | 1 - .../tachiyomi/source/online/HttpSource.kt | 21 +++++-------------- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/util/ExceptionFormatter.kt b/app/src/main/java/eu/kanade/presentation/util/ExceptionFormatter.kt index be3cfff1a..e4e4eed03 100644 --- a/app/src/main/java/eu/kanade/presentation/util/ExceptionFormatter.kt +++ b/app/src/main/java/eu/kanade/presentation/util/ExceptionFormatter.kt @@ -2,7 +2,6 @@ package eu.kanade.presentation.util import android.content.Context import eu.kanade.tachiyomi.network.HttpException -import eu.kanade.tachiyomi.source.online.LicensedMangaChaptersException import eu.kanade.tachiyomi.util.system.isOnline import tachiyomi.core.common.i18n.stringResource import tachiyomi.data.source.NoResultsException @@ -25,7 +24,6 @@ val Throwable.formattedMessage: String is NoResultsException -> return stringResource(MR.strings.no_results_found) is SourceNotInstalledException -> return stringResource(MR.strings.loader_not_implemented_error) - is LicensedMangaChaptersException -> return stringResource(MR.strings.licensed_manga_chapters_error) } return when (val className = this::class.simpleName) { "Exception", "IOException" -> message ?: className diff --git a/i18n/src/commonMain/moko-resources/base/strings.xml b/i18n/src/commonMain/moko-resources/base/strings.xml index 035047acd..2d202ccf6 100644 --- a/i18n/src/commonMain/moko-resources/base/strings.xml +++ b/i18n/src/commonMain/moko-resources/base/strings.xml @@ -647,7 +647,6 @@ No more results No results found - Licensed - No chapters to show Local source Other Last used diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt index 7ffa538b5..712b281b3 100644 --- a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt +++ b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt @@ -251,28 +251,19 @@ abstract class HttpSource : CatalogueSource { * * @param manga the manga to update. * @return the chapters for the manga. - * @throws LicensedMangaChaptersException if a manga is licensed and therefore no chapters are available. */ @Suppress("DEPRECATION") override suspend fun getChapterList(manga: SManga): List { - if (manga.status == SManga.LICENSED) { - throw LicensedMangaChaptersException() - } - return fetchChapterList(manga).awaitSingle() } @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getChapterList")) override fun fetchChapterList(manga: SManga): Observable> { - return if (manga.status != SManga.LICENSED) { - client.newCall(chapterListRequest(manga)) - .asObservableSuccess() - .map { response -> - chapterListParse(response) - } - } else { - Observable.error(LicensedMangaChaptersException()) - } + return client.newCall(chapterListRequest(manga)) + .asObservableSuccess() + .map { response -> + chapterListParse(response) + } } /** @@ -472,5 +463,3 @@ abstract class HttpSource : CatalogueSource { */ override fun getFilterList() = FilterList() } - -class LicensedMangaChaptersException : RuntimeException()