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 3476fdb92..65d8ab5a2 100755 --- a/core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt +++ b/core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt @@ -2,8 +2,8 @@ package eu.kanade.tachiyomi.network import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.suspendCancellableCoroutine +import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.ExperimentalSerializationApi -import kotlinx.serialization.KSerializer import kotlinx.serialization.json.Json import kotlinx.serialization.json.okio.decodeFromBufferedSource import kotlinx.serialization.serializer @@ -21,8 +21,6 @@ import uy.kohesive.injekt.api.get import java.io.IOException import java.util.concurrent.atomic.AtomicBoolean import kotlin.coroutines.resumeWithException -import kotlin.reflect.KType -import kotlin.reflect.typeOf val jsonMime = "application/json; charset=utf-8".toMediaType() @@ -134,13 +132,11 @@ fun OkHttpClient.newCachelessCallWithProgress(request: Request, listener: Progre } inline fun Response.parseAs(/* SY --> */json: Json = Injekt.get()/* SY <-- */): T { - return internalParseAs(typeOf(), this, /* SY --> */ json /* SY <-- */) + return decodeFromJsonResponse(serializer(), this, /* SY --> */ json /* SY <-- */) } -@Suppress("UNCHECKED_CAST") @OptIn(ExperimentalSerializationApi::class) -fun internalParseAs(type: KType, response: Response, /* SY --> */ json: Json /* SY <-- */): T { - val deserializer = serializer(type) as KSerializer +fun decodeFromJsonResponse(deserializer: DeserializationStrategy, response: Response, /* SY --> */ json: Json /* SY <-- */): T { return response.body.source().use { json.decodeFromBufferedSource(deserializer, it) }