Draff/Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop using internal OkHttp APIs (#11172)

Browse Source
This commit is contained in:
arkon 2022-03-18 22:27:30 -04:00 committed by GitHub
parent 84714f887f
commit 5db3e03d15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/mangadex/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'MangaDex' extName = 'MangaDex'
pkgNameSuffix = 'all.mangadex' pkgNameSuffix = 'all.mangadex'
extClass = '.MangaDexFactory' extClass = '.MangaDexFactory'
extVersionCode = 157 extVersionCode = 158
isNsfw = true isNsfw = true
} }

9
src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexInterceptors.kt
View File

@ -12,7 +12,6 @@ import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.RequestBody.Companion.toRequestBody
import okhttp3.Response import okhttp3.Response
import okhttp3.internal.closeQuietly
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
/** /**
@ -61,16 +60,14 @@ class MdAtHomeReportInterceptor(
val jsonString = json.encodeToString(result) val jsonString = json.encodeToString(result)
val postResult = client.newCall( try {
client.newCall(
POST( POST(
MDConstants.atHomePostUrl, MDConstants.atHomePostUrl,
headers, headers,
jsonString.toRequestBody("application/json".toMediaType()) jsonString.toRequestBody("application/json".toMediaType())
) )
) ).execute().close()
try {
val body = postResult.execute()
body.closeQuietly()
} catch (e: Exception) { } catch (e: Exception) {
Log.e("MangaDex", "Error trying to POST report to MD@Home: ${e.message}") Log.e("MangaDex", "Error trying to POST report to MD@Home: ${e.message}")
} }

2
src/zh/dmzj/build.gradle
View File

@ -6,7 +6,7 @@ ext {
extName = 'Dmzj' extName = 'Dmzj'
pkgNameSuffix = 'zh.dmzj' pkgNameSuffix = 'zh.dmzj'
extClass = '.Dmzj' extClass = '.Dmzj'
extVersionCode = 27 extVersionCode = 28
} }
dependencies { dependencies {

8
src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/utils/HttpGetFailoverInterceptor.kt
View File

@ -4,8 +4,6 @@ import android.util.Log
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
import okhttp3.Interceptor import okhttp3.Interceptor
import okhttp3.Response import okhttp3.Response
import okhttp3.internal.closeQuietly
import java.lang.Exception
/** /**
* An OkHttp interceptor that will switch to a failover address and retry when an HTTP GET request * An OkHttp interceptor that will switch to a failover address and retry when an HTTP GET request
@ -45,7 +43,11 @@ class HttpGetFailoverInterceptor : Interceptor {
} catch (e: Exception) { } catch (e: Exception) {
Log.d(LOG_TAG, "[HttpGetFailoverInterceptor] failed with exception, next: $retry", e) Log.d(LOG_TAG, "[HttpGetFailoverInterceptor] failed with exception, next: $retry", e)
} }
response?.closeQuietly() try {
response?.close()
} catch (_: Exception) {
// Ignore exceptions
}
request = request.newBuilder().url(retry).build() request = request.newBuilder().url(retry).build()
} }
return chain.proceed(request) return chain.proceed(request)