From ac2301e4be18f4ef5cf9fabb4e4e2235c44cdadd Mon Sep 17 00:00:00 2001 From: Carlos <2092019+CarlosEsco@users.noreply.github.com> Date: Fri, 18 Dec 2020 20:48:35 -0500 Subject: [PATCH] fix group serializer (cherry picked from commit e47d84f1af1eebe63b3dfc618daee29e18ee4156) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/ApiMangaParser.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt # app/src/main/res/raw/changelog_release.xml # buildSrc/src/main/kotlin/Configs.kt --- app/src/main/java/exh/md/handlers/ApiMangaParser.kt | 8 +++++++- .../exh/md/handlers/serializers/ApiMangaSerializer.kt | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt index 6a70ff1f6..9fc86d208 100644 --- a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt +++ b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt @@ -230,7 +230,13 @@ class ApiMangaParser(private val langs: List) { val networkApiManga = MdUtil.jsonParser.decodeFromString(jsonData) val networkManga = networkApiManga.data.manga val networkChapters = networkApiManga.data.chapters - val groups = networkApiManga.data.groups.map { it.id to it.name }.toMap() + val groups = networkApiManga.data.groups.mapNotNull { + if (it.name == null) { + null + } else { + it.id to it.name + } + }.toMap() val status = networkManga.publication!!.status diff --git a/app/src/main/java/exh/md/handlers/serializers/ApiMangaSerializer.kt b/app/src/main/java/exh/md/handlers/serializers/ApiMangaSerializer.kt index 366c0d7ac..528bd5228 100644 --- a/app/src/main/java/exh/md/handlers/serializers/ApiMangaSerializer.kt +++ b/app/src/main/java/exh/md/handlers/serializers/ApiMangaSerializer.kt @@ -72,5 +72,5 @@ data class ChapterSerializer( @Serializable data class GroupSerializer( val id: Long, - val name: String + val name: String? = null ) \ No newline at end of file