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

Handle Cloudflare in default network client and deprecate cloudflareClient

Browse Source 
(cherry picked from commit 22e8050fff273a189d2fdfae6e66ec622f04f1dd)

# Conflicts:
#	core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
This commit is contained in:
arkon 2023-07-15 09:34:20 -04:00 committed by Jobobby04
parent 28001588b6
commit c8d2646a34
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
View File

@ -47,6 +47,8 @@ open /* SY <-- */ class NetworkHelper(
builder.addNetworkInterceptor(httpLoggingInterceptor) builder.addNetworkInterceptor(httpLoggingInterceptor)
} }
builder.addInterceptor(cloudflareInterceptor)
when (preferences.dohProvider().get()) { when (preferences.dohProvider().get()) {
PREF_DOH_CLOUDFLARE -> builder.dohCloudflare() PREF_DOH_CLOUDFLARE -> builder.dohCloudflare()
PREF_DOH_GOOGLE -> builder.dohGoogle() PREF_DOH_GOOGLE -> builder.dohGoogle()
@ -68,11 +70,14 @@ open /* SY <-- */ class NetworkHelper(
/* SY --> */ /* SY --> */
open /* SY <-- */val client by lazy { baseClientBuilder.cache(Cache(cacheDir, cacheSize)).build() } open /* SY <-- */val client by lazy { baseClientBuilder.cache(Cache(cacheDir, cacheSize)).build() }
/**
* @deprecated Since extension-lib 1.5
*/
@Deprecated("The regular client handles Cloudflare by default")
@Suppress("UNUSED")
/* SY --> */ /* SY --> */
open /* SY <-- */val cloudflareClient by lazy { open /* SY <-- */val cloudflareClient by lazy {
client.newBuilder() client
.addInterceptor(cloudflareInterceptor)
.build()
} }
fun defaultUserAgentProvider() = preferences.defaultUserAgent().get().trim() fun defaultUserAgentProvider() = preferences.defaultUserAgent().get().trim()