From 13b532c12aa90bc1a9ccb7991ae9f40d093df2ef Mon Sep 17 00:00:00 2001 From: tarsin Date: Tue, 30 May 2023 20:16:02 +0800 Subject: [PATCH] Revert "Fix usingCancellable with null ret value" This reverts commit d464d000675dc5db4fc0c7d2ef591761c4854bf9. --- app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt | 2 +- .../java/com/hippo/ehviewer/client/EhRequestBuilder.kt | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt index b920b0e7f..2b64db826 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt @@ -116,7 +116,7 @@ private fun rethrowExactly(code: Int, headers: Headers, body: String, e: Throwab throw e } -private suspend inline fun Request.executeAndParsingWith(crossinline block: String.() -> T): T { +private suspend inline fun Request.executeAndParsingWith(block: String.() -> T): T { Log.d(TAG, url.toString()) return execute { val body = body.string() diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhRequestBuilder.kt b/app/src/main/java/com/hippo/ehviewer/client/EhRequestBuilder.kt index 96f1684f6..727bf7cb6 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhRequestBuilder.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/EhRequestBuilder.kt @@ -79,11 +79,10 @@ suspend inline fun Call.usingCancellable(crossinline block: Response.() -> R r.exceptionOrNull()?.let { Log.e(TAG_CALL, "Reading response of call$call failed!") cont.resumeWithException(it) - } ?: run { + } + r.getOrNull()?.let { Log.d(TAG_CALL, "Reading response of call$call succeed!") - // R maybe null - @Suppress("UNCHECKED_CAST") - cont.resume(r.getOrNull() as R) + cont.resume(it) } } else if (isCanceled() && cont.isActive) { Log.e(TAG_CALL, "call$call cancelled but coroutine is Active!")