From d8b27a4f430990eb3a651ff57da8ac3c2bb64c10 Mon Sep 17 00:00:00 2001 From: stevenyomi <95685115+stevenyomi@users.noreply.github.com> Date: Sat, 29 Oct 2022 10:44:31 +0800 Subject: [PATCH] Reorder parameters of JSON parsing method (#8321) (cherry picked from commit 073e9f94ff06a538c4aa06aa3db0ac1a6cf5be5b) # Conflicts: # core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt --- .../main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt b/core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt index 65bc7d7cb..a10964e75 100755 --- a/core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt +++ b/core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt @@ -122,12 +122,12 @@ fun OkHttpClient.newCachelessCallWithProgress(request: Request, listener: Progre } inline fun Response.parseAs(/* SY --> */json: Json = Injekt.get()/* SY <-- */): T { - return internalParseAs(this, typeOf(), /* SY --> */ json /* SY <-- */) + return internalParseAs(typeOf(), this, /* SY --> */ json /* SY <-- */) } @Suppress("UNCHECKED_CAST") @OptIn(ExperimentalSerializationApi::class) -fun internalParseAs(response: Response, type: KType, /* SY --> */ json: Json /* SY <-- */): T { +fun internalParseAs(type: KType, response: Response, /* SY --> */ json: Json /* SY <-- */): T { val deserializer = serializer(type) as KSerializer return response.body.source().use { json.decodeFromBufferedSource(deserializer, it)