Clean up NetworkHelper
(cherry picked from commit e0733c1a4cef28cf413ca79597ba5ad739b5328a) # Conflicts: # core/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
This commit is contained in:
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user