From 68e45aa67d52af3dd06e7aeb0178807f4aa74675 Mon Sep 17 00:00:00 2001
From: Alessandro Jean <14254807+alessandrojean@users.noreply.github.com>
Date: Sat, 24 Sep 2022 23:34:21 -0300
Subject: [PATCH] Remove usages of okhttp3.internal to avoid crashes. (#13574)

---
 .../bilibili/bilibilicomics/src/BilibiliComicsFactory.kt       | 3 +--
 multisrc/overrides/madara/mryaoifansub/src/MrYaoiFansub.kt     | 3 +--
 .../eu/kanade/tachiyomi/multisrc/bilibili/BilibiliGenerator.kt | 2 +-
 .../eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt     | 2 +-
 src/all/mangaup/build.gradle                                   | 2 +-
 .../src/eu/kanade/tachiyomi/extension/all/mangaup/MangaUp.kt   | 3 +--
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/multisrc/overrides/bilibili/bilibilicomics/src/BilibiliComicsFactory.kt b/multisrc/overrides/bilibili/bilibilicomics/src/BilibiliComicsFactory.kt
index 692deb55a..fabd9bf27 100644
--- a/multisrc/overrides/bilibili/bilibilicomics/src/BilibiliComicsFactory.kt
+++ b/multisrc/overrides/bilibili/bilibilicomics/src/BilibiliComicsFactory.kt
@@ -25,7 +25,6 @@ import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.Response
-import okhttp3.internal.closeQuietly
 import okio.Buffer
 import java.io.IOException
 import java.net.URLDecoder
@@ -209,7 +208,7 @@ abstract class BilibiliComics(lang: String) : Bilibili(
             val refreshTokenResponse = chain.proceed(refreshTokenRequest)
 
             accessTokenCookie = refreshTokenParse(refreshTokenResponse)
-            refreshTokenResponse.closeQuietly()
+            refreshTokenResponse.close()
 
             request = request.newBuilder()
                 .header("Authorization", "Bearer ${accessTokenCookie!!.accessToken}")
diff --git a/multisrc/overrides/madara/mryaoifansub/src/MrYaoiFansub.kt b/multisrc/overrides/madara/mryaoifansub/src/MrYaoiFansub.kt
index fd2755150..ce78ec21e 100644
--- a/multisrc/overrides/madara/mryaoifansub/src/MrYaoiFansub.kt
+++ b/multisrc/overrides/madara/mryaoifansub/src/MrYaoiFansub.kt
@@ -5,7 +5,6 @@ import eu.kanade.tachiyomi.network.interceptor.rateLimit
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Response
-import okhttp3.internal.closeQuietly
 import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.Locale
@@ -30,7 +29,7 @@ class MrYaoiFansub : Madara(
             return response
         }
 
-        response.closeQuietly()
+        response.close()
         throw IOException(LOGIN_THROUGH_WEBVIEW_ERROR)
     }
 
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliGenerator.kt
index 07d47aa7b..3c7ee0318 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliGenerator.kt
@@ -18,7 +18,7 @@ class BilibiliGenerator : ThemeSourceGenerator {
             baseUrl = "https://www.bilibilicomics.com",
             langs = listOf("en", "zh-Hans", "id", "es", "fr"),
             className = "BilibiliComicsFactory",
-            overrideVersionCode = 2
+            overrideVersionCode = 3
         ),
         SingleLang(
             name = "BILIBILI MANGA",
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
index 26bc01344..cc4487a27 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
@@ -346,7 +346,7 @@ class MadaraGenerator : ThemeSourceGenerator {
         SingleLang("Momo no Hana Scan", "https://momonohanascan.com", "pt-BR", className = "MomoNoHanaScan", overrideVersionCode = 1),
         SingleLang("MonarcaManga", "https://monarcamanga.com", "es"),
         SingleLang("Mortals Groove", "https://mortalsgroove.com", "en", overrideVersionCode = 1),
-        SingleLang("MR Yaoi Fansub", "https://mrtenzus.com", "pt-BR", isNsfw = true, className = "MrYaoiFansub"),
+        SingleLang("MR Yaoi Fansub", "https://mrtenzus.com", "pt-BR", isNsfw = true, className = "MrYaoiFansub", overrideVersionCode = 1),
         SingleLang("Muctau", "https://www.bibimanga.com", "en", overrideVersionCode = 2),
         SingleLang("MurimScan", "https://murimscan.run", "en", isNsfw = true),
         SingleLang("My Universe Scanlator", "https://muscan.com.br", "pt-BR"),
diff --git a/src/all/mangaup/build.gradle b/src/all/mangaup/build.gradle
index 922f71a0f..5b1c118cf 100644
--- a/src/all/mangaup/build.gradle
+++ b/src/all/mangaup/build.gradle
@@ -6,7 +6,7 @@ ext {
     extName = 'Manga UP!'
     pkgNameSuffix = 'all.mangaup'
     extClass = '.MangaUpFactory'
-    extVersionCode = 2
+    extVersionCode = 3
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/mangaup/src/eu/kanade/tachiyomi/extension/all/mangaup/MangaUp.kt b/src/all/mangaup/src/eu/kanade/tachiyomi/extension/all/mangaup/MangaUp.kt
index 314f3318e..1427db52f 100644
--- a/src/all/mangaup/src/eu/kanade/tachiyomi/extension/all/mangaup/MangaUp.kt
+++ b/src/all/mangaup/src/eu/kanade/tachiyomi/extension/all/mangaup/MangaUp.kt
@@ -17,7 +17,6 @@ import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
-import okhttp3.internal.closeQuietly
 import rx.Observable
 import uy.kohesive.injekt.injectLazy
 
@@ -169,7 +168,7 @@ class MangaUp(override val lang: String) : HttpSource() {
                 ?: title.thumbnailUrl
                 ?: return response
 
-            response.closeQuietly()
+            response.close()
             val thumbnailRequest = GET(thumbnailUrl, request.headers)
             return chain.proceed(thumbnailRequest)
         }