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 6d56c8e74..da278605b 100644 --- a/app/src/main/java/eu/kanade/presentation/util/ExceptionFormatter.kt +++ b/app/src/main/java/eu/kanade/presentation/util/ExceptionFormatter.kt @@ -1,7 +1,6 @@ package eu.kanade.presentation.util import android.content.Context -import eu.kanade.tachiyomi.animesource.online.LicensedEntryItemsException import eu.kanade.tachiyomi.network.HttpException import eu.kanade.tachiyomi.util.system.isOnline import tachiyomi.core.common.i18n.stringResource @@ -30,9 +29,6 @@ val Throwable.formattedMessage: String is SourceNotInstalledException, is AnimeSourceNotInstalledException -> return stringResource( MR.strings.loader_not_implemented_error, ) - is LicensedEntryItemsException -> 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 f380787dd..a9f9ef315 100644 --- a/i18n/src/commonMain/moko-resources/base/strings.xml +++ b/i18n/src/commonMain/moko-resources/base/strings.xml @@ -1051,7 +1051,6 @@ Chapter/Episode updates Force app to recheck downloaded chapters and episodes +%1$d s - Licensed - No items to show Next Episode not found! Storage Manga diff --git a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/animesource/online/AnimeHttpSource.kt b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/animesource/online/AnimeHttpSource.kt index c24c8b370..2de9bb4c7 100644 --- a/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/animesource/online/AnimeHttpSource.kt +++ b/source-api/src/commonMain/kotlin/eu/kanade/tachiyomi/animesource/online/AnimeHttpSource.kt @@ -252,28 +252,19 @@ abstract class AnimeHttpSource : AnimeCatalogueSource { * * @param anime the anime to update. * @return the chapters for the manga. - * @throws LicensedEntryItemsException if a anime is licensed and therefore no episodes are available. */ @Suppress("DEPRECATION") override suspend fun getEpisodeList(anime: SAnime): List { - if (anime.status == SAnime.LICENSED) { - throw LicensedEntryItemsException() - } - return fetchEpisodeList(anime).awaitSingle() } @Deprecated("Use the non-RxJava API instead", replaceWith = ReplaceWith("getEpisodeList")) override fun fetchEpisodeList(anime: SAnime): Observable> { - return if (anime.status != SAnime.LICENSED) { - client.newCall(episodeListRequest(anime)) - .asObservableSuccess() - .map { response -> - episodeListParse(response) - } - } else { - Observable.error(LicensedEntryItemsException()) - } + return client.newCall(episodeListRequest(anime)) + .asObservableSuccess() + .map { response -> + episodeListParse(response) + } } /** @@ -535,5 +526,3 @@ abstract class AnimeHttpSource : AnimeCatalogueSource { */ override fun getFilterList() = AnimeFilterList() } - -class LicensedEntryItemsException : RuntimeException() 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 1e2e0832d..cf59f7417 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 @@ -247,28 +247,19 @@ abstract class HttpSource : CatalogueSource { * * @param manga the manga to update. * @return the chapters for the manga. - * @throws LicensedEntryItemsException 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 LicensedEntryItemsException() - } - 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(LicensedEntryItemsException()) - } + return client.newCall(chapterListRequest(manga)) + .asObservableSuccess() + .map { response -> + chapterListParse(response) + } } /** @@ -468,5 +459,3 @@ abstract class HttpSource : CatalogueSource { */ override fun getFilterList() = FilterList() } - -class LicensedEntryItemsException : RuntimeException()