Clean up NetworkHelper

(cherry picked from commit e0733c1a4cef28cf413ca79597ba5ad739b5328a)

# Conflicts:
#	core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
This commit is contained in:
arkon
2023-07-15 13:05:25 -04:00
committed by Jobobby04
parent ef343107fe
commit 8062cb8f6f
3 changed files with 43 additions and 55 deletions
@@ -45,11 +45,9 @@ abstract class HttpSource : CatalogueSource {
.maybeInjectEHLogger()
.build()
@Deprecated("The regular client handles Cloudflare by default")
override val cloudflareClient: OkHttpClient
get() = delegate?.networkCloudflareClient ?: network.cloudflareClient
.newBuilder()
.maybeInjectEHLogger()
.build()
get() = delegate?.networkHttpClient ?: client
override val cookieJar: AndroidCookieJar
get() = network.cookieJar
@@ -134,7 +134,6 @@ abstract class DelegatedHttpSource(val delegate: HttpSource) : HttpSource() {
*/
open val baseHttpClient: OkHttpClient? = null
open val networkHttpClient: OkHttpClient get() = network.client
open val networkCloudflareClient: OkHttpClient get() = network.cloudflareClient
/**
* Visible name of the source.