From c073f71ec16ba89f0bca63c55eb586fd2574e033 Mon Sep 17 00:00:00 2001 From: Carlos <2092019+CarlosEsco@users.noreply.github.com> Date: Sun, 13 Dec 2020 11:02:08 -0500 Subject: [PATCH] fix v2 api call for groups (cherry picked from commit 01903e341be6cd5ae50ce6eee88be6ad40fd1835) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/ApiMangaParser.kt --- app/src/main/java/exh/md/handlers/ApiMangaParser.kt | 2 +- .../exh/md/handlers/serializers/ApiMangaSerializer.kt | 8 +++++++- 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 8bffb9c3f..6a70ff1f6 100644 --- a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt +++ b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt @@ -230,7 +230,7 @@ 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 + val groups = networkApiManga.data.groups.map { 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 c5c5a9231..366c0d7ac 100644 --- a/app/src/main/java/exh/md/handlers/serializers/ApiMangaSerializer.kt +++ b/app/src/main/java/exh/md/handlers/serializers/ApiMangaSerializer.kt @@ -12,7 +12,7 @@ data class ApiMangaSerializer( data class DataSerializer( val manga: MangaSerializer, val chapters: List, - val groups: Map, + val groups: List, ) @@ -68,3 +68,9 @@ data class ChapterSerializer( val groups: List, val timestamp: Long ) + +@Serializable +data class GroupSerializer( + val id: Long, + val name: String +) \ No newline at end of file