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

Remove usages of okhttp3.internal to avoid crashes. (#13574)

Browse Source
This commit is contained in:
Alessandro Jean 2022-09-24 23:34:21 -03:00 committed by GitHub
parent 144d9bb004
commit 68e45aa67d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multisrc/overrides/bilibili/bilibilicomics/src/BilibiliComicsFactory.kt
View File

@ -25,7 +25,6 @@ import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.RequestBody.Companion.toRequestBody
import okhttp3.Response import okhttp3.Response
import okhttp3.internal.closeQuietly
import okio.Buffer import okio.Buffer
import java.io.IOException import java.io.IOException
import java.net.URLDecoder import java.net.URLDecoder
@ -209,7 +208,7 @@ abstract class BilibiliComics(lang: String) : Bilibili(
val refreshTokenResponse = chain.proceed(refreshTokenRequest) val refreshTokenResponse = chain.proceed(refreshTokenRequest)
accessTokenCookie = refreshTokenParse(refreshTokenResponse) accessTokenCookie = refreshTokenParse(refreshTokenResponse)
refreshTokenResponse.closeQuietly() refreshTokenResponse.close()
request = request.newBuilder() request = request.newBuilder()
.header("Authorization", "Bearer ${accessTokenCookie!!.accessToken}") .header("Authorization", "Bearer ${accessTokenCookie!!.accessToken}")

3
multisrc/overrides/madara/mryaoifansub/src/MrYaoiFansub.kt
View File

@ -5,7 +5,6 @@ import eu.kanade.tachiyomi.network.interceptor.rateLimit
import okhttp3.Interceptor import okhttp3.Interceptor
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Response import okhttp3.Response
import okhttp3.internal.closeQuietly
import java.io.IOException import java.io.IOException
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Locale import java.util.Locale
@ -30,7 +29,7 @@ class MrYaoiFansub : Madara(
return response return response
} }
response.closeQuietly() response.close()
throw IOException(LOGIN_THROUGH_WEBVIEW_ERROR) throw IOException(LOGIN_THROUGH_WEBVIEW_ERROR)
} }

2
multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bilibili/BilibiliGenerator.kt
View File

@ -18,7 +18,7 @@ class BilibiliGenerator : ThemeSourceGenerator {
baseUrl = "https://www.bilibilicomics.com", baseUrl = "https://www.bilibilicomics.com",
langs = listOf("en", "zh-Hans", "id", "es", "fr"), langs = listOf("en", "zh-Hans", "id", "es", "fr"),
className = "BilibiliComicsFactory", className = "BilibiliComicsFactory",
overrideVersionCode = 2 overrideVersionCode = 3
), ),
SingleLang( SingleLang(
name = "BILIBILI MANGA", name = "BILIBILI MANGA",

2
multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/madara/MadaraGenerator.kt
View File

@ -346,7 +346,7 @@ class MadaraGenerator : ThemeSourceGenerator {
SingleLang("Momo no Hana Scan", "https://momonohanascan.com", "pt-BR", className = "MomoNoHanaScan", overrideVersionCode = 1), SingleLang("Momo no Hana Scan", "https://momonohanascan.com", "pt-BR", className = "MomoNoHanaScan", overrideVersionCode = 1),
SingleLang("MonarcaManga", "https://monarcamanga.com", "es"), SingleLang("MonarcaManga", "https://monarcamanga.com", "es"),
SingleLang("Mortals Groove", "https://mortalsgroove.com", "en", overrideVersionCode = 1), 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("Muctau", "https://www.bibimanga.com", "en", overrideVersionCode = 2),
SingleLang("MurimScan", "https://murimscan.run", "en", isNsfw = true), SingleLang("MurimScan", "https://murimscan.run", "en", isNsfw = true),
SingleLang("My Universe Scanlator", "https://muscan.com.br", "pt-BR"), SingleLang("My Universe Scanlator", "https://muscan.com.br", "pt-BR"),

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

@ -6,7 +6,7 @@ ext {
extName = 'Manga UP!' extName = 'Manga UP!'
pkgNameSuffix = 'all.mangaup' pkgNameSuffix = 'all.mangaup'
extClass = '.MangaUpFactory' extClass = '.MangaUpFactory'
extVersionCode = 2 extVersionCode = 3
} }
apply from: "$rootDir/common.gradle" apply from: "$rootDir/common.gradle"

3
src/all/mangaup/src/eu/kanade/tachiyomi/extension/all/mangaup/MangaUp.kt
View File

@ -17,7 +17,6 @@ import okhttp3.Interceptor
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
import okhttp3.Response import okhttp3.Response
import okhttp3.internal.closeQuietly
import rx.Observable import rx.Observable
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
@ -169,7 +168,7 @@ class MangaUp(override val lang: String) : HttpSource() {
?: title.thumbnailUrl ?: title.thumbnailUrl
?: return response ?: return response
response.closeQuietly() response.close()
val thumbnailRequest = GET(thumbnailUrl, request.headers) val thumbnailRequest = GET(thumbnailUrl, request.headers)
return chain.proceed(thumbnailRequest) return chain.proceed(thumbnailRequest)
} }