diff --git a/app/src/leanback/AndroidManifest.xml b/app/src/leanback/AndroidManifest.xml index bc83fea36..57b88e609 100644 --- a/app/src/leanback/AndroidManifest.xml +++ b/app/src/leanback/AndroidManifest.xml @@ -14,9 +14,7 @@ android:required="false" /> - - diff --git a/catvod/build.gradle b/catvod/build.gradle index b791ebc75..933c484d7 100644 --- a/catvod/build.gradle +++ b/catvod/build.gradle @@ -22,11 +22,13 @@ dependencies { api 'androidx.annotation:annotation:1.3.0' api 'androidx.preference:preference:1.2.1' api 'com.google.code.gson:gson:' + gsonVersion + api 'com.google.net.cronet:cronet-okhttp:0.1.0' api 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3' api 'com.orhanobut:logger:2.2.0' api 'com.squareup.okhttp3:okhttp:' + okhttpVersion api 'com.squareup.okhttp3:okhttp-dnsoverhttps:' + okhttpVersion api 'com.squareup.okhttp3:logging-interceptor:' + okhttpVersion + api 'org.chromium.net:cronet-embedded:119.6045.31' api('com.google.guava:guava:33.0.0-android') { exclude group: 'com.google.code.findbugs', module: 'jsr305' exclude group: 'org.checkerframework', module: 'checker-compat-qual' 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 713d4ff58..c8dfbe652 100644 --- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java +++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java @@ -5,10 +5,14 @@ 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; @@ -164,6 +168,7 @@ 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);