From 803bbb9ebdd20ea0f4be9539183a39604d26b54a Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 5 Feb 2025 01:26:42 +0800 Subject: [PATCH] Remove cronet --- app/build.gradle | 2 -- app/proguard-rules.pro | 4 ---- catvod/src/main/java/com/github/catvod/net/OkHttp.java | 1 + 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1415b44ef..9ff0c9693 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -102,13 +102,11 @@ dependencies { implementation 'com.github.jahirfiquitiva:TextDrawable:1.0.3' implementation 'com.github.thegrizzlylabs:sardine-android:0.9' implementation 'com.google.android.material:material:1.12.0' - implementation 'com.google.net.cronet:cronet-okhttp:0.1.0' implementation 'com.google.zxing:core:3.3.0' implementation 'com.guolindev.permissionx:permissionx:1.8.0' implementation 'com.hierynomus:smbj:0.14.0' implementation 'io.antmedia:rtmp-client:3.2.0' implementation 'javax.servlet:javax.servlet-api:3.1.0' - implementation 'org.chromium.net:cronet-embedded:76.3809.111' implementation 'org.eclipse.jetty:jetty-client:8.1.21.v20160908' implementation('org.eclipse.jetty:jetty-server:8.1.21.v20160908') { exclude group: 'org.eclipse.jetty.orbit', module: 'javax.servlet' } implementation('org.eclipse.jetty:jetty-servlet:8.1.21.v20160908') { exclude group: 'org.eclipse.jetty.orbit', module: 'javax.servlet' } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 757064042..72ad61d3f 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -37,10 +37,6 @@ -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 07c9a61e6..9905b67ff 100644 --- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java +++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java @@ -152,6 +152,7 @@ public class OkHttp { private static OkHttpClient.Builder getBuilder() { HttpLoggingInterceptor logging = new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY); OkHttpClient.Builder builder = new OkHttpClient.Builder().cookieJar(OkCookieJar.get()).addInterceptor(new RequestInterceptor()).addNetworkInterceptor(new 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()); builder.proxySelector(get().proxy ? selector() : defaultSelector); //builder.addNetworkInterceptor(logging); return builder;