From 5db3e03d15befdfac59b2303a7467aae96e9d1e1 Mon Sep 17 00:00:00 2001
From: arkon <arkon@users.noreply.github.com>
Date: Fri, 18 Mar 2022 22:27:30 -0400
Subject: [PATCH] Stop using internal OkHttp APIs (#11172)

---
 src/all/mangadex/build.gradle                   |  2 +-
 .../extension/all/mangadex/MangaDex.kt          |  2 +-
 .../all/mangadex/MangaDexInterceptors.kt        | 17 +++++++----------
 src/zh/dmzj/build.gradle                        |  2 +-
 .../zh/dmzj/utils/HttpGetFailoverInterceptor.kt |  8 +++++---
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/all/mangadex/build.gradle b/src/all/mangadex/build.gradle
index 32e799278..6eb2f159c 100644
--- a/src/all/mangadex/build.gradle
+++ b/src/all/mangadex/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'MangaDex'
     pkgNameSuffix = 'all.mangadex'
     extClass = '.MangaDexFactory'
-    extVersionCode = 157
+    extVersionCode = 158
     isNsfw = true
 }
 
diff --git a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt
index ea65289a7..266ae29bd 100644
--- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt
+++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt
@@ -291,7 +291,7 @@ abstract class MangaDex(override val lang: String, val dexLang: String) :
         val listDto = helper.json.decodeFromString<ListDto>(response.body!!.string())
         val listDtoFiltered = listDto.data.relationships.filter { it.type != "Manga" }
         val amount = listDtoFiltered.count()
-        if (amount < 1){
+        if (amount < 1) {
             throw Exception("No Manga in List")
         }
         val minIndex = (page - 1) * MDConstants.mangaLimit
diff --git a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexInterceptors.kt b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexInterceptors.kt
index d4b446fb7..4415ddf23 100644
--- a/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexInterceptors.kt
+++ b/src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDexInterceptors.kt
@@ -12,7 +12,6 @@ import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
-import okhttp3.internal.closeQuietly
 import uy.kohesive.injekt.injectLazy
 
 /**
@@ -61,16 +60,14 @@ class MdAtHomeReportInterceptor(
 
                 val jsonString = json.encodeToString(result)
 
-                val postResult = client.newCall(
-                    POST(
-                        MDConstants.atHomePostUrl,
-                        headers,
-                        jsonString.toRequestBody("application/json".toMediaType())
-                    )
-                )
                 try {
-                    val body = postResult.execute()
-                    body.closeQuietly()
+                    client.newCall(
+                        POST(
+                            MDConstants.atHomePostUrl,
+                            headers,
+                            jsonString.toRequestBody("application/json".toMediaType())
+                        )
+                    ).execute().close()
                 } catch (e: Exception) {
                     Log.e("MangaDex", "Error trying to POST report to MD@Home: ${e.message}")
                 }
diff --git a/src/zh/dmzj/build.gradle b/src/zh/dmzj/build.gradle
index cb75155bc..dfb7d2266 100644
--- a/src/zh/dmzj/build.gradle
+++ b/src/zh/dmzj/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'Dmzj'
     pkgNameSuffix = 'zh.dmzj'
     extClass = '.Dmzj'
-    extVersionCode = 27
+    extVersionCode = 28
 }
 
 dependencies {
diff --git a/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/utils/HttpGetFailoverInterceptor.kt b/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/utils/HttpGetFailoverInterceptor.kt
index d16f62dd2..773332267 100644
--- a/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/utils/HttpGetFailoverInterceptor.kt
+++ b/src/zh/dmzj/src/eu/kanade/tachiyomi/extension/zh/dmzj/utils/HttpGetFailoverInterceptor.kt
@@ -4,8 +4,6 @@ import android.util.Log
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
 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
@@ -45,7 +43,11 @@ class HttpGetFailoverInterceptor : Interceptor {
             } catch (e: Exception) {
                 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()
         }
         return chain.proceed(request)