From 553b6aed87c080c4cc61b7bd5ceb4a1567929b9b Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 30 Dec 2022 19:32:56 +0800 Subject: [PATCH] Fix bug --- app/build.gradle | 2 +- app/src/main/java/com/fongmi/android/tv/net/OkHttp.java | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b9a6e3d7b..9e45699e5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -75,7 +75,6 @@ dependencies { implementation 'cat.ereza:customactivityoncrash:2.4.0' implementation 'com.github.bassaer:materialdesigncolors:1.0.0' implementation 'com.github.bumptech.glide:glide:4.14.2' - implementation 'com.google.android.gms:play-services-cronet:18.0.1' implementation 'com.google.android.material:material:1.7.0' implementation 'com.google.code.gson:gson:2.10' implementation 'com.google.net.cronet:cronet-okhttp:0.1.0' @@ -85,6 +84,7 @@ dependencies { implementation 'me.jessyan:autosize:1.2.1' implementation 'net.java.dev.jna:jna:5.12.1' implementation 'org.apache.commons:commons-compress:1.20' + implementation 'org.chromium.net:cronet-embedded:108.5359.79' implementation 'org.greenrobot:eventbus:3.3.1' implementation 'org.nanohttpd:nanohttpd:2.3.1' implementation('org.simpleframework:simple-xml:2.7.1') { exclude group: 'stax', module: 'stax-api' exclude group: 'xpp3', module: 'xpp3' } diff --git a/app/src/main/java/com/fongmi/android/tv/net/OkHttp.java b/app/src/main/java/com/fongmi/android/tv/net/OkHttp.java index 1c5111b59..7a90682f5 100644 --- a/app/src/main/java/com/fongmi/android/tv/net/OkHttp.java +++ b/app/src/main/java/com/fongmi/android/tv/net/OkHttp.java @@ -34,11 +34,7 @@ public class OkHttp { } private OkHttpClient.Builder getBuilder() { - try { - return new OkHttpClient.Builder().addInterceptor(CronetInterceptor.newBuilder(new CronetEngine.Builder(App.get()).build()).build()).callTimeout(30, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).writeTimeout(30, TimeUnit.SECONDS).connectTimeout(30, TimeUnit.SECONDS).hostnameVerifier(SSLSocketFactoryCompat.hostnameVerifier).sslSocketFactory(new SSLSocketFactoryCompat(), SSLSocketFactoryCompat.trustAllCert); - } catch (Exception e) { - return new OkHttpClient.Builder().callTimeout(30, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).writeTimeout(30, TimeUnit.SECONDS).connectTimeout(30, TimeUnit.SECONDS).hostnameVerifier(SSLSocketFactoryCompat.hostnameVerifier).sslSocketFactory(new SSLSocketFactoryCompat(), SSLSocketFactoryCompat.trustAllCert); - } + return new OkHttpClient.Builder().addInterceptor(CronetInterceptor.newBuilder(new CronetEngine.Builder(App.get()).build()).build()).callTimeout(30, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).writeTimeout(30, TimeUnit.SECONDS).connectTimeout(30, TimeUnit.SECONDS).hostnameVerifier(SSLSocketFactoryCompat.hostnameVerifier).sslSocketFactory(new SSLSocketFactoryCompat(), SSLSocketFactoryCompat.trustAllCert); } private OkHttpClient client() {