YanLongChangAn/legado
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2022-03-09 11:03:18 +08:00
parent 648c6783ff
commit ea5591db09
1 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/help/http/OkHttpUtils.kt
+5 -25
View File
@@ -29,7 +29,7 @@ suspend fun OkHttpClient.newCallResponse(
requestBuilder.apply(builder) requestBuilder.apply(builder)
var response: Response? = null var response: Response? = null
for (i in 0..retry) { for (i in 0..retry) {
response = this@newCallResponse.newCall(requestBuilder.build()).await() response = newCall(requestBuilder.build()).await()
if (response.isSuccessful) { if (response.isSuccessful) {
return@withContext response return@withContext response
} }
@@ -42,18 +42,8 @@ suspend fun OkHttpClient.newCallResponseBody(
retry: Int = 0, retry: Int = 0,
builder: Request.Builder.() -> Unit builder: Request.Builder.() -> Unit
): ResponseBody { ): ResponseBody {
return withContext(IO) { return newCallResponse(retry, builder).let {
val requestBuilder = Request.Builder() it.body ?: throw IOException(it.message)
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)
} }
} }
@@ -61,18 +51,8 @@ suspend fun OkHttpClient.newCallStrResponse(
retry: Int = 0, retry: Int = 0,
builder: Request.Builder.() -> Unit builder: Request.Builder.() -> Unit
): StrResponse { ): StrResponse {
return withContext(IO) { return newCallResponse(retry, builder).let {
val requestBuilder = Request.Builder() StrResponse(it, it.body?.text() ?: it.message)
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)
} }
} }