From ea5591db093448abbe642ff11fcd169e49b2cc62 Mon Sep 17 00:00:00 2001 From: kunfei Date: Wed, 9 Mar 2022 11:03:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/help/http/OkHttpUtils.kt | 30 ++++--------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/http/OkHttpUtils.kt b/app/src/main/java/io/legado/app/help/http/OkHttpUtils.kt index b8f1b9789..f51094a26 100644 --- a/app/src/main/java/io/legado/app/help/http/OkHttpUtils.kt +++ b/app/src/main/java/io/legado/app/help/http/OkHttpUtils.kt @@ -29,7 +29,7 @@ suspend fun OkHttpClient.newCallResponse( requestBuilder.apply(builder) var response: Response? = null for (i in 0..retry) { - response = this@newCallResponse.newCall(requestBuilder.build()).await() + response = newCall(requestBuilder.build()).await() if (response.isSuccessful) { return@withContext response } @@ -42,18 +42,8 @@ suspend fun OkHttpClient.newCallResponseBody( retry: Int = 0, builder: Request.Builder.() -> Unit ): ResponseBody { - return withContext(IO) { - val requestBuilder = Request.Builder() - requestBuilder.header(AppConst.UA_NAME, AppConfig.userAgent) - requestBuilder.apply(builder) - var response: Response? = null - for (i in 0..retry) { - response = this@newCallResponseBody.newCall(requestBuilder.build()).await() - if (response.isSuccessful) { - return@withContext response.body!! - } - } - return@withContext response!!.body ?: throw IOException(response.message) + return newCallResponse(retry, builder).let { + it.body ?: throw IOException(it.message) } } @@ -61,18 +51,8 @@ suspend fun OkHttpClient.newCallStrResponse( retry: Int = 0, builder: Request.Builder.() -> Unit ): StrResponse { - return withContext(IO) { - val requestBuilder = Request.Builder() - requestBuilder.header(AppConst.UA_NAME, AppConfig.userAgent) - requestBuilder.apply(builder) - var response: Response? = null - for (i in 0..retry) { - response = this@newCallStrResponse.newCall(requestBuilder.build()).await() - if (response.isSuccessful) { - return@withContext StrResponse(response, response.body!!.text()) - } - } - return@withContext StrResponse(response!!, response.body?.text() ?: response.message) + return newCallResponse(retry, builder).let { + StrResponse(it, it.body?.text() ?: it.message) } }