From 4b2325394219d5eef21bd5ac0489adde813dfc8d Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 22 Nov 2023 15:09:55 +0800
Subject: [PATCH] Clean code

---
 app/build.gradle                                       | 1 +
 app/src/main/java/com/fongmi/android/tv/App.java       | 7 +++++++
 catvod/build.gradle                                    | 3 +--
 catvod/src/main/java/com/github/catvod/net/OkHttp.java | 7 -------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f6fcf0666..6209a9503 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -118,6 +118,7 @@ dependencies {
     implementation 'com.google.zxing:core:3.3.0'
     implementation 'com.guolindev.permissionx:permissionx:1.7.1'
     implementation 'com.hierynomus:smbj:0.11.5'
+    implementation 'org.conscrypt:conscrypt-android:2.5.2'
     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'
diff --git a/app/src/main/java/com/fongmi/android/tv/App.java b/app/src/main/java/com/fongmi/android/tv/App.java
index 6c7aa6bed..d9097358e 100644
--- a/app/src/main/java/com/fongmi/android/tv/App.java
+++ b/app/src/main/java/com/fongmi/android/tv/App.java
@@ -25,6 +25,9 @@ import com.orhanobut.logger.LogAdapter;
 import com.orhanobut.logger.Logger;
 import com.orhanobut.logger.PrettyFormatStrategy;
 
+import org.conscrypt.Conscrypt;
+
+import java.security.Security;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -39,6 +42,10 @@ public class App extends Application {
     private final Gson gson;
     private boolean hook;
 
+    static {
+        Security.insertProviderAt(Conscrypt.newProvider(), 1);
+    }
+
     public App() {
         instance = this;
         executor = Executors.newFixedThreadPool(Constant.THREAD_POOL);
diff --git a/catvod/build.gradle b/catvod/build.gradle
index efaee0916..cf7f79544 100644
--- a/catvod/build.gradle
+++ b/catvod/build.gradle
@@ -13,9 +13,8 @@ android {
 
 dependencies {
     api project(':media-lib-common')
-    implementation 'androidx.preference:preference:1.2.1'
-    implementation 'org.conscrypt:conscrypt-android:2.5.2'
     api 'androidx.annotation:annotation:' + annotationVersion
+    api 'androidx.preference:preference:1.2.1'
     api 'com.google.code.gson:gson:' + gsonVersion
     api 'com.orhanobut:logger:2.2.0'
     api 'com.squareup.okhttp3:okhttp:' + okhttpVersion
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 94ab7313b..7242e82b6 100644
--- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java
+++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java
@@ -9,10 +9,7 @@ import com.github.catvod.utils.Path;
 import com.github.catvod.utils.Util;
 import com.google.common.net.HttpHeaders;
 
-import org.conscrypt.Conscrypt;
-
 import java.security.SecureRandom;
-import java.security.Security;
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
 import java.util.Map;
@@ -57,10 +54,6 @@ public class OkHttp {
         return get().dns != null ? get().dns : Dns.SYSTEM;
     }
 
-    public OkHttp() {
-        Security.insertProviderAt(Conscrypt.newProvider(), 1);
-    }
-
     public void setDoh(Doh doh) {
         OkHttpClient dohClient = new OkHttpClient.Builder().cache(new Cache(Path.doh(), CACHE)).build();
         dns = doh.getUrl().isEmpty() ? null : new DnsOverHttps.Builder().client(dohClient).url(HttpUrl.get(doh.getUrl())).bootstrapDnsHosts(doh.getHosts()).build();