mirror of
				https://github.com/mihonapp/mihon.git
				synced 2025-11-04 08:08:55 +01:00 
			
		
		
		
	Handle Cloudflare in default network client and deprecate cloudflareClient
This commit is contained in:
		@@ -44,6 +44,8 @@ class NetworkHelper(
 | 
			
		||||
                builder.addNetworkInterceptor(httpLoggingInterceptor)
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            builder.addInterceptor(cloudflareInterceptor)
 | 
			
		||||
 | 
			
		||||
            when (preferences.dohProvider().get()) {
 | 
			
		||||
                PREF_DOH_CLOUDFLARE -> builder.dohCloudflare()
 | 
			
		||||
                PREF_DOH_GOOGLE -> builder.dohGoogle()
 | 
			
		||||
@@ -64,12 +66,12 @@ class NetworkHelper(
 | 
			
		||||
 | 
			
		||||
    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")
 | 
			
		||||
    val cloudflareClient by lazy {
 | 
			
		||||
        client.newBuilder()
 | 
			
		||||
            .addInterceptor(cloudflareInterceptor)
 | 
			
		||||
            .build()
 | 
			
		||||
    }
 | 
			
		||||
    val cloudflareClient = client
 | 
			
		||||
 | 
			
		||||
    fun defaultUserAgentProvider() = preferences.defaultUserAgent().get().trim()
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user