From 49ecc98bcede4ee5cc3fef9814d2ab280ef37e07 Mon Sep 17 00:00:00 2001 From: AwkwardPeak7 <48650614+AwkwardPeak7@users.noreply.github.com> Date: Sat, 14 Jun 2025 02:08:43 +0500 Subject: [PATCH] Remove usage of okhttp internal variables (#9216) * Remove usage of okhttp internal variables inaccessable or removed in new version of okhttp * lint * lint :2 --- src/en/igniscomic/build.gradle | 2 +- .../kanade/tachiyomi/extension/en/igniscomic/IgnisComic.kt | 6 +++--- src/en/mangamo/build.gradle | 2 +- .../kanade/tachiyomi/extension/en/mangamo/MangamoAuth.kt | 7 ++----- src/pt/gekkouscans/build.gradle | 2 +- .../tachiyomi/extension/pt/gekkouscans/GekkouScans.kt | 2 +- src/pt/imperiodabritannia/build.gradle | 2 +- .../extension/pt/imperiodabritannia/ImperioDaBritannia.kt | 4 ++-- src/pt/taiyo/build.gradle | 2 +- .../src/eu/kanade/tachiyomi/extension/pt/taiyo/Taiyo.kt | 4 ++-- 10 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/en/igniscomic/build.gradle b/src/en/igniscomic/build.gradle index e084fba36..347d4e495 100644 --- a/src/en/igniscomic/build.gradle +++ b/src/en/igniscomic/build.gradle @@ -3,7 +3,7 @@ ext { extClass = '.IgnisComic' themePkg = 'mangathemesia' baseUrl = 'https://manhuaga.com' - overrideVersionCode = 2 + overrideVersionCode = 3 isNsfw = false } diff --git a/src/en/igniscomic/src/eu/kanade/tachiyomi/extension/en/igniscomic/IgnisComic.kt b/src/en/igniscomic/src/eu/kanade/tachiyomi/extension/en/igniscomic/IgnisComic.kt index 4f1b09d6c..8a9111095 100644 --- a/src/en/igniscomic/src/eu/kanade/tachiyomi/extension/en/igniscomic/IgnisComic.kt +++ b/src/en/igniscomic/src/eu/kanade/tachiyomi/extension/en/igniscomic/IgnisComic.kt @@ -2,8 +2,8 @@ package eu.kanade.tachiyomi.extension.en.igniscomic import eu.kanade.tachiyomi.multisrc.mangathemesia.MangaThemesia import okhttp3.OkHttpClient -import okhttp3.internal.http.HTTP_INTERNAL_SERVER_ERROR -import okhttp3.internal.http.HTTP_OK +import java.net.HttpURLConnection.HTTP_INTERNAL_ERROR +import java.net.HttpURLConnection.HTTP_OK class IgnisComic : MangaThemesia( "Ignis Comic", @@ -13,7 +13,7 @@ class IgnisComic : MangaThemesia( override val client: OkHttpClient = super.client.newBuilder() .addInterceptor { chain -> val response = chain.proceed(chain.request()) - response.takeIf { it.code < HTTP_INTERNAL_SERVER_ERROR } + response.takeIf { it.code < HTTP_INTERNAL_ERROR } ?: response.newBuilder() .code(HTTP_OK) .build() diff --git a/src/en/mangamo/build.gradle b/src/en/mangamo/build.gradle index 8eaf7b13e..6ed53bb38 100644 --- a/src/en/mangamo/build.gradle +++ b/src/en/mangamo/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Mangamo' extClass = '.Mangamo' - extVersionCode = 4 + extVersionCode = 5 isNsfw = false } diff --git a/src/en/mangamo/src/eu/kanade/tachiyomi/extension/en/mangamo/MangamoAuth.kt b/src/en/mangamo/src/eu/kanade/tachiyomi/extension/en/mangamo/MangamoAuth.kt index 95036d8a5..f6d3d939b 100644 --- a/src/en/mangamo/src/eu/kanade/tachiyomi/extension/en/mangamo/MangamoAuth.kt +++ b/src/en/mangamo/src/eu/kanade/tachiyomi/extension/en/mangamo/MangamoAuth.kt @@ -9,7 +9,6 @@ import eu.kanade.tachiyomi.network.POST import okhttp3.Headers import okhttp3.OkHttpClient import okhttp3.RequestBody.Companion.toRequestBody -import okhttp3.internal.EMPTY_HEADERS class MangamoAuth( private val helper: MangamoHelper, @@ -53,8 +52,7 @@ class MangamoAuth( val googleIdentityResponse = client.newCall( POST( "https://identitytoolkit.googleapis.com/v1/accounts:signInWithCustomToken?key=${MangamoConstants.FIREBASE_API_KEY}", - EMPTY_HEADERS, - "{\"token\":\"$customToken\",\"returnSecureToken\":true}".toRequestBody(), + body = "{\"token\":\"$customToken\",\"returnSecureToken\":true}".toRequestBody(), ), ).execute() @@ -97,8 +95,7 @@ class MangamoAuth( val googleIdentityResponse = client.newCall( POST( "https://identitytoolkit.googleapis.com/v1/accounts:signUp?key=${MangamoConstants.FIREBASE_API_KEY}", - EMPTY_HEADERS, - "{\"returnSecureToken\":true}".toRequestBody(), + body = "{\"returnSecureToken\":true}".toRequestBody(), ), ).execute() diff --git a/src/pt/gekkouscans/build.gradle b/src/pt/gekkouscans/build.gradle index 4211b0e6d..2fbc3d187 100644 --- a/src/pt/gekkouscans/build.gradle +++ b/src/pt/gekkouscans/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Gekkou Scans' extClass = '.GekkouScans' - extVersionCode = 42 + extVersionCode = 43 isNsfw = true } diff --git a/src/pt/gekkouscans/src/eu/kanade/tachiyomi/extension/pt/gekkouscans/GekkouScans.kt b/src/pt/gekkouscans/src/eu/kanade/tachiyomi/extension/pt/gekkouscans/GekkouScans.kt index 58d9c319f..51d87103d 100644 --- a/src/pt/gekkouscans/src/eu/kanade/tachiyomi/extension/pt/gekkouscans/GekkouScans.kt +++ b/src/pt/gekkouscans/src/eu/kanade/tachiyomi/extension/pt/gekkouscans/GekkouScans.kt @@ -14,8 +14,8 @@ import okhttp3.HttpUrl.Companion.toHttpUrl import okhttp3.Interceptor import okhttp3.Request import okhttp3.Response -import okhttp3.internal.http.HTTP_FORBIDDEN import java.io.IOException +import java.net.HttpURLConnection.HTTP_FORBIDDEN class GekkouScans : HttpSource() { diff --git a/src/pt/imperiodabritannia/build.gradle b/src/pt/imperiodabritannia/build.gradle index 1958bffa6..a15d3dcec 100644 --- a/src/pt/imperiodabritannia/build.gradle +++ b/src/pt/imperiodabritannia/build.gradle @@ -3,7 +3,7 @@ ext { extClass = '.ImperioDaBritannia' themePkg = 'madara' baseUrl = 'https://imperiodabritannia.com' - overrideVersionCode = 3 + overrideVersionCode = 4 isNsfw = false } diff --git a/src/pt/imperiodabritannia/src/eu/kanade/tachiyomi/extension/pt/imperiodabritannia/ImperioDaBritannia.kt b/src/pt/imperiodabritannia/src/eu/kanade/tachiyomi/extension/pt/imperiodabritannia/ImperioDaBritannia.kt index aaeaaf822..14fecf5e4 100644 --- a/src/pt/imperiodabritannia/src/eu/kanade/tachiyomi/extension/pt/imperiodabritannia/ImperioDaBritannia.kt +++ b/src/pt/imperiodabritannia/src/eu/kanade/tachiyomi/extension/pt/imperiodabritannia/ImperioDaBritannia.kt @@ -3,8 +3,8 @@ package eu.kanade.tachiyomi.extension.pt.imperiodabritannia import eu.kanade.tachiyomi.multisrc.madara.Madara import eu.kanade.tachiyomi.network.interceptor.rateLimit import okhttp3.OkHttpClient -import okhttp3.internal.http.HTTP_FORBIDDEN -import okhttp3.internal.http.HTTP_OK +import java.net.HttpURLConnection.HTTP_FORBIDDEN +import java.net.HttpURLConnection.HTTP_OK import java.text.SimpleDateFormat import java.util.Locale import java.util.concurrent.TimeUnit diff --git a/src/pt/taiyo/build.gradle b/src/pt/taiyo/build.gradle index c30b1ad5f..ebead09cf 100644 --- a/src/pt/taiyo/build.gradle +++ b/src/pt/taiyo/build.gradle @@ -1,7 +1,7 @@ ext { extName = 'Taiyō' extClass = '.Taiyo' - extVersionCode = 7 + extVersionCode = 8 isNsfw = true } diff --git a/src/pt/taiyo/src/eu/kanade/tachiyomi/extension/pt/taiyo/Taiyo.kt b/src/pt/taiyo/src/eu/kanade/tachiyomi/extension/pt/taiyo/Taiyo.kt index a8c9440f5..3ba33d09e 100644 --- a/src/pt/taiyo/src/eu/kanade/tachiyomi/extension/pt/taiyo/Taiyo.kt +++ b/src/pt/taiyo/src/eu/kanade/tachiyomi/extension/pt/taiyo/Taiyo.kt @@ -32,13 +32,13 @@ import okhttp3.MediaType.Companion.toMediaType import okhttp3.Request import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.Response -import okhttp3.internal.http.HTTP_FORBIDDEN -import okhttp3.internal.http.HTTP_UNAUTHORIZED import org.jsoup.nodes.Document import org.jsoup.nodes.Element import org.jsoup.select.Elements import rx.Observable import uy.kohesive.injekt.injectLazy +import java.net.HttpURLConnection.HTTP_FORBIDDEN +import java.net.HttpURLConnection.HTTP_UNAUTHORIZED import java.text.SimpleDateFormat import java.util.Locale