From 85425a66a2d9bc157272ab2ba7968a92685aa522 Mon Sep 17 00:00:00 2001 From: Carlos <2092019+CarlosEsco@users.noreply.github.com> Date: Wed, 13 Jan 2021 18:18:53 -0500 Subject: [PATCH] fix chapter deeplink (cherry picked from commit f0dd30587a98c27bca59088f119d85f2fc044f25) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/source/online/handlers/ApiMangaParser.kt --- app/src/main/java/exh/md/handlers/ApiMangaParser.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt index b166691ed..5e9c67ccc 100644 --- a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt +++ b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt @@ -21,6 +21,7 @@ import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.intOrNull +import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive import okhttp3.Response import rx.Completable @@ -253,13 +254,13 @@ class ApiMangaParser(private val lang: String) { fun chapterParseForMangaId(response: Response): Int { try { if (response.code != 200) throw Exception("HTTP error ${response.code}") - val body = response.body?.string().orEmpty() - if (body.isEmpty()) { + val body = response.body?.string() + if (body.isNullOrBlank()) { throw Exception("Null Response") } val jsonObject = Json.decodeFromString(body) - return jsonObject["manga_id"]?.jsonPrimitive?.intOrNull ?: throw Exception("No manga associated with chapter") + return jsonObject["data"]!!.jsonObject["mangaId"]?.jsonPrimitive?.intOrNull ?: throw Exception("No manga associated with chapter") } catch (e: Exception) { XLog.tag("ApiMangaParser").enableStackTrace(2).e(e) throw e