From c8d2646a342aa8407fa0dd753325fa0db619bd89 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 15 Jul 2023 09:34:20 -0400 Subject: [PATCH] Handle Cloudflare in default network client and deprecate cloudflareClient (cherry picked from commit 22e8050fff273a189d2fdfae6e66ec622f04f1dd) # Conflicts: # core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt --- .../java/eu/kanade/tachiyomi/network/NetworkHelper.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt b/core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt index 2588f175a..6fd1df33b 100755 --- a/core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt +++ b/core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt @@ -47,6 +47,8 @@ open /* SY <-- */ class NetworkHelper( builder.addNetworkInterceptor(httpLoggingInterceptor) } + builder.addInterceptor(cloudflareInterceptor) + when (preferences.dohProvider().get()) { PREF_DOH_CLOUDFLARE -> builder.dohCloudflare() PREF_DOH_GOOGLE -> builder.dohGoogle() @@ -68,11 +70,14 @@ open /* SY <-- */ class NetworkHelper( /* SY --> */ 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 --> */ open /* SY <-- */val cloudflareClient by lazy { - client.newBuilder() - .addInterceptor(cloudflareInterceptor) - .build() + client } fun defaultUserAgentProvider() = preferences.defaultUserAgent().get().trim()