diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt index fe1d419b5..220b5790c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/MangaDex.kt @@ -151,8 +151,8 @@ class MangaDex(delegate: HttpSource, val context: Context) : } private fun mangaPlusPageListRequest(chapter: SChapter): Request { - val chpUrl = chapter.url.substringBefore(MdUtil.apiChapterSuffix) - return GET(MdUtil.baseUrl + chpUrl + MdUtil.apiChapterSuffix, headers, CacheControl.FORCE_NETWORK) + val urlChapterId = MdUtil.getChapterId(chapter.url) + return GET(MdUtil.apiUrl + MdUtil.newApiChapter + urlChapterId + MdUtil.apiChapterSuffix, headers, CacheControl.FORCE_NETWORK) } override fun fetchImage(page: Page): Observable { diff --git a/app/src/main/java/exh/md/handlers/ApiChapterParser.kt b/app/src/main/java/exh/md/handlers/ApiChapterParser.kt index 582b35930..2ce30b3de 100644 --- a/app/src/main/java/exh/md/handlers/ApiChapterParser.kt +++ b/app/src/main/java/exh/md/handlers/ApiChapterParser.kt @@ -4,8 +4,6 @@ import eu.kanade.tachiyomi.network.parseAs import eu.kanade.tachiyomi.source.model.Page import exh.md.handlers.serializers.ApiChapterSerializer import exh.md.utils.MdUtil -import kotlinx.serialization.decodeFromString -import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive @@ -27,8 +25,7 @@ class ApiChapterParser { } fun externalParse(response: Response): String { - val jsonData = response.body!!.string() - val json = Json.decodeFromString(jsonData) + val json = response.parseAs() val external = json["data"]!!.jsonObject["pages"]!!.jsonPrimitive.content return external.substringAfterLast("/") }