From 0c3e8f977cfeec4c7649ad906bc9f444f28c57ee Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Thu, 22 Jul 2021 19:46:42 -0400 Subject: [PATCH] Fix crash with open in webview after migrate --- .../kanade/tachiyomi/data/database/models/MangaImpl.kt | 8 ++++++-- .../kanade/tachiyomi/data/library/CustomMangaManager.kt | 9 ++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt index e185e01c1..2446837b3 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaImpl.kt @@ -12,8 +12,6 @@ open class MangaImpl : Manga { override lateinit var url: String // SY --> - private val customMangaManager: CustomMangaManager by injectLazy() - override var title: String get() = if (favorite) { val customTitle = customMangaManager.getManga(this)?.title @@ -93,4 +91,10 @@ open class MangaImpl : Manga { override fun hashCode(): Int { return url.hashCode() + id.hashCode() } + + // SY --> + companion object { + private val customMangaManager: CustomMangaManager by injectLazy() + } + // SY <-- } 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 b9633764e..fc5aa5765 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 @@ -36,7 +36,14 @@ class CustomMangaManager(val context: Context) { } fun saveMangaInfo(manga: MangaJson) { - if (manga.title == null && manga.author == null && manga.artist == null && manga.description == null && manga.genre == null && manga.status == null) { + if ( + manga.title == null && + manga.author == null && + manga.artist == null && + manga.description == null && + manga.genre == null && + manga.status == null + ) { customMangaMap.remove(manga.id!!) } else { customMangaMap[manga.id!!] = manga.toManga()