From 0f633d2d50fae86830bdc02eb71cfe117d09a6d9 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 16 Jan 2023 00:18:42 +0800 Subject: [PATCH] Clean cdoe --- app/src/main/java/com/fongmi/android/tv/bean/Site.java | 2 +- app/src/main/java/com/fongmi/android/tv/net/OkHttp.java | 3 +-- drpy/src/main/java/com/hiker/drpy/net/OkHttp.java | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Site.java b/app/src/main/java/com/fongmi/android/tv/bean/Site.java index 41493e172..6f62274e5 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Site.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Site.java @@ -125,7 +125,7 @@ public class Site { } public Integer getSwitchable() { - return switchable == null ? 0 : switchable; + return switchable == null ? 1 : switchable; } public String getExt() { 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 814fbd3df..3b2347312 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 @@ -7,7 +7,6 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; import okhttp3.Call; -import okhttp3.ConnectionPool; import okhttp3.Headers; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; @@ -31,7 +30,7 @@ public class OkHttp { } public static OkHttpClient client(int timeout) { - return new OkHttpClient.Builder().connectionPool(new ConnectionPool(20, 5, TimeUnit.MINUTES)).connectTimeout(timeout, TimeUnit.SECONDS).hostnameVerifier(SSLSocketFactoryCompat.hostnameVerifier).sslSocketFactory(new SSLSocketFactoryCompat(), SSLSocketFactoryCompat.trustAllCert).build(); + return new OkHttpClient.Builder().connectTimeout(timeout, TimeUnit.SECONDS).hostnameVerifier(SSLSocketFactoryCompat.hostnameVerifier).sslSocketFactory(new SSLSocketFactoryCompat(), SSLSocketFactoryCompat.trustAllCert).build(); } public static Call newCall(String url) { diff --git a/drpy/src/main/java/com/hiker/drpy/net/OkHttp.java b/drpy/src/main/java/com/hiker/drpy/net/OkHttp.java index 4e962cddd..7a728db23 100644 --- a/drpy/src/main/java/com/hiker/drpy/net/OkHttp.java +++ b/drpy/src/main/java/com/hiker/drpy/net/OkHttp.java @@ -5,7 +5,6 @@ import org.json.JSONObject; import java.util.concurrent.TimeUnit; import okhttp3.Call; -import okhttp3.ConnectionPool; import okhttp3.Headers; import okhttp3.MediaType; import okhttp3.OkHttpClient; @@ -31,7 +30,7 @@ public class OkHttp { } private OkHttpClient.Builder getBuilder() { - return new OkHttpClient.Builder().connectionPool(new ConnectionPool(20, 5, TimeUnit.MINUTES)).hostnameVerifier(SSLSocketFactoryCompat.hostnameVerifier).sslSocketFactory(new SSLSocketFactoryCompat(), SSLSocketFactoryCompat.trustAllCert); + return new OkHttpClient.Builder().hostnameVerifier(SSLSocketFactoryCompat.hostnameVerifier).sslSocketFactory(new SSLSocketFactoryCompat(), SSLSocketFactoryCompat.trustAllCert); } private OkHttpClient client() {