From 683c6a4a2113bee6af9e6203f5e7bf1686c8edeb Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Wed, 29 May 2024 10:17:48 +0700 Subject: [PATCH] fix(LocalSource): Url is not initialized --- .../java/eu/kanade/tachiyomi/source/LocalSource.kt | 10 ++++++++-- .../kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt index c6b8de9627..c663a90b3c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt @@ -198,11 +198,17 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour val legacyJsonFile = localMangaFiles.firstOrNull { it.extension.orEmpty().equals("json", true) } if (comicInfoFile != null) - return SManga.create().apply { setMangaDetailsFromComicInfoFile(comicInfoFile.openInputStream(), this) } + return SManga.create().apply { + url = manga.url + setMangaDetailsFromComicInfoFile(comicInfoFile.openInputStream(), this) + } // TODO: Remove after awhile if (legacyJsonFile != null) { - val rt = SManga.create().apply { setMangaDetailsFromLegacyJsonFile(legacyJsonFile.openInputStream(), this) } + val rt = SManga.create().apply { + url = manga.url + setMangaDetailsFromLegacyJsonFile(legacyJsonFile.openInputStream(), this) + } val comicInfo = rt.toComicInfo() localMangaDir.createFile(COMIC_INFO_FILE) ?.writeText(xml.encodeToString(ComicInfo.serializer(), comicInfo)) { legacyJsonFile.delete() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt index b3d0dff02f..9d22e4bac9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt @@ -783,7 +783,6 @@ class MangaDetailsPresenter( db.updateViewerFlags(manga).executeAsBlocking() } manga.status = status ?: SManga.UNKNOWN - // TODO: Use ComicInfo LocalSource(downloadManager.context).updateMangaInfo(manga, lang) db.updateMangaInfo(manga).executeAsBlocking() } else {