From b2429c67736223e3dffb0d2ae2399f802ffc5c37 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 30 Dec 2022 17:37:10 +0800 Subject: [PATCH] Support http/3 --- app/proguard-rules.pro | 1 - app/src/main/java/com/fongmi/android/tv/net/OkHttp.java | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 35a535dee..99fd0af1e 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -27,7 +27,6 @@ -keep class okhttp3.** { *; } # Cronet --keep class org.chromium.net.**{*;} -keep class com.google.net.cronet.**{*;} # CatVod 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 598d1b329..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 @@ -2,6 +2,11 @@ package com.fongmi.android.tv.net; import android.util.ArrayMap; +import com.fongmi.android.tv.App; +import com.google.net.cronet.okhttptransport.CronetInterceptor; + +import org.chromium.net.CronetEngine; + import java.util.Map; import java.util.Objects; import java.util.concurrent.TimeUnit; @@ -29,7 +34,7 @@ public class OkHttp { } private OkHttpClient.Builder getBuilder() { - 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() {