From a528657c52fa6522ee81f545c56727ba6a09597a Mon Sep 17 00:00:00 2001 From: FongMi Date: Sat, 15 Feb 2025 00:19:45 +0800 Subject: [PATCH] Add cronet --- app/proguard-rules.pro | 4 ++++ catvod/src/main/java/com/github/catvod/net/OkHttp.java | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 51adc1085..01f168bc7 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -37,6 +37,10 @@ -keep class org.fourthline.cling.** { *; } -keep class javax.xml.** { *; } +# Cronet +-keep class org.chromium.net.** { *; } +-keep class com.google.net.cronet.** { *; } + # EXO -dontwarn org.kxml2.io.** -dontwarn org.xmlpull.v1.** diff --git a/catvod/src/main/java/com/github/catvod/net/OkHttp.java b/catvod/src/main/java/com/github/catvod/net/OkHttp.java index c8dfbe652..713d4ff58 100644 --- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java +++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java @@ -5,14 +5,10 @@ import android.text.TextUtils; import androidx.collection.ArrayMap; -import com.github.catvod.Init; import com.github.catvod.bean.Doh; import com.github.catvod.net.interceptor.RequestInterceptor; import com.github.catvod.net.interceptor.ResponseInterceptor; import com.github.catvod.utils.Path; -import com.google.net.cronet.okhttptransport.CronetInterceptor; - -import org.chromium.net.CronetEngine; import java.net.ProxySelector; import java.security.SecureRandom; @@ -168,7 +164,6 @@ public class OkHttp { private static OkHttpClient.Builder getBuilder() { OkHttpClient.Builder builder = new OkHttpClient.Builder().cookieJar(OkCookieJar.get()).addInterceptor(requestInterceptor()).addNetworkInterceptor(responseInterceptor()).connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS).readTimeout(TIMEOUT, TimeUnit.MILLISECONDS).writeTimeout(TIMEOUT, TimeUnit.MILLISECONDS).dns(dns()).hostnameVerifier((hostname, session) -> true).sslSocketFactory(getSSLContext().getSocketFactory(), trustAllCertificates()); - builder.addInterceptor(CronetInterceptor.newBuilder(new CronetEngine.Builder(Init.context()).build()).build()); HttpLoggingInterceptor logging = new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY); builder.proxySelector(get().proxy ? selector() : defaultSelector); //builder.addNetworkInterceptor(logging);