From bda2f81c664a23c27a1ccf54cfb626293589f155 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Mon, 22 Aug 2022 12:43:55 -0400 Subject: [PATCH] Minor cleanup --- app/src/main/java/eu/kanade/domain/manga/model/Manga.kt | 2 +- .../java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt | 1 - .../java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt b/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt index 71e5b5861..f8a294b85 100644 --- a/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt +++ b/app/src/main/java/eu/kanade/domain/manga/model/Manga.kt @@ -60,7 +60,7 @@ data class Manga( get() = customMangaInfo?.genre ?: ogGenre val status: Long - get() = customMangaInfo?.statusLong ?: ogStatus + get() = customMangaInfo?.status ?: ogStatus // SY <-- val sorting: Long diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt index 27b13a9eb..6cdf62050 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/CustomMangaManager.kt @@ -103,7 +103,6 @@ class CustomMangaManager(val context: Context) { val genreString by lazy { genre?.joinToString() } - val statusLong = status?.toLong() fun toJson(): MangaJson { return MangaJson( diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt index d88e31c2e..53684c209 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MergedSource.kt @@ -61,11 +61,13 @@ class MergedSource : HttpSource() { override fun chapterListParse(response: Response) = throw UnsupportedOperationException() override fun pageListParse(response: Response) = throw UnsupportedOperationException() override fun imageUrlParse(response: Response) = throw UnsupportedOperationException() + @Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getChapterList")) override fun fetchChapterList(manga: SManga) = throw UnsupportedOperationException() override suspend fun getChapterList(manga: SManga) = throw UnsupportedOperationException() override fun fetchImage(page: Page) = throw UnsupportedOperationException() override fun fetchImageUrl(page: Page) = throw UnsupportedOperationException() + @Deprecated("Use the 1.x API instead", replaceWith = ReplaceWith("getPageList")) override fun fetchPageList(chapter: SChapter) = throw UnsupportedOperationException() override suspend fun getPageList(chapter: SChapter) = throw UnsupportedOperationException()