From 5ccde61ae1c6f557233dc48d57ad4a953aace6ec Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 12 Jun 2022 11:29:48 -0400 Subject: [PATCH] Minor cleanup --- .../main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt | 2 +- .../eu/kanade/domain/chapter/interactor/GetChapterByMangaId.kt | 2 +- .../eu/kanade/domain/chapter/repository/ChapterRepository.kt | 2 +- .../ui/browse/extension/details/ExtensionDetailsController.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt b/app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt index 5caaf98469..703ae5784f 100644 --- a/app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt +++ b/app/src/main/java/eu/kanade/data/chapter/ChapterRepositoryImpl.kt @@ -100,7 +100,7 @@ class ChapterRepositoryImpl( return handler.awaitList { chaptersQueries.getChaptersByMangaId(mangaId, chapterMapper) } } - override suspend fun getChapterByMangaIdFlow(mangaId: Long): Flow> { + override suspend fun getChapterByMangaIdAsFlow(mangaId: Long): Flow> { return handler.subscribeToList { chaptersQueries.getChaptersByMangaId(mangaId, chapterMapper) } } } diff --git a/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapterByMangaId.kt b/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapterByMangaId.kt index 6e8db75100..3582a56763 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapterByMangaId.kt +++ b/app/src/main/java/eu/kanade/domain/chapter/interactor/GetChapterByMangaId.kt @@ -22,7 +22,7 @@ class GetChapterByMangaId( suspend fun subscribe(mangaId: Long): Flow> { return try { - chapterRepository.getChapterByMangaIdFlow(mangaId) + chapterRepository.getChapterByMangaIdAsFlow(mangaId) } catch (e: Exception) { logcat(LogPriority.ERROR, e) flowOf(emptyList()) diff --git a/app/src/main/java/eu/kanade/domain/chapter/repository/ChapterRepository.kt b/app/src/main/java/eu/kanade/domain/chapter/repository/ChapterRepository.kt index 9f785d2851..7d9c47afc6 100644 --- a/app/src/main/java/eu/kanade/domain/chapter/repository/ChapterRepository.kt +++ b/app/src/main/java/eu/kanade/domain/chapter/repository/ChapterRepository.kt @@ -16,5 +16,5 @@ interface ChapterRepository { suspend fun getChapterByMangaId(mangaId: Long): List - suspend fun getChapterByMangaIdFlow(mangaId: Long): Flow> + suspend fun getChapterByMangaIdAsFlow(mangaId: Long): Flow> } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt index ec804c4bd2..e2c3ec34b0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt @@ -114,7 +114,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) : else -> "$url/multisrc/overrides/$pkgFactory/" + (pkgName.split(".").lastOrNull() ?: "") + path } } else { - url + "/src/" + pkgName.replace(".", "/") + path + url + "/src/" + pkgName.replace(".", "/") + path } }