Clean code

app/build.gradle

@@ -119,7 +119,6 @@ dependencies {
     implementation 'com.guolindev.permissionx:permissionx:1.7.1'
     implementation 'com.hierynomus:smbj:0.11.5'
     implementation 'org.chromium.net:cronet-embedded:76.3809.111'
-    implementation 'org.conscrypt:conscrypt-android:2.5.2'
     implementation 'org.eclipse.jetty:jetty-client:8.1.21.v20160908'
     implementation 'org.eclipse.jetty:jetty-server:8.1.21.v20160908'
     implementation 'org.eclipse.jetty:jetty-servlet:8.1.21.v20160908'

app/src/main/java/com/fongmi/android/tv/App.java

@@ -25,9 +25,6 @@ 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;
 
@@ -101,7 +98,6 @@ public class App extends Application {
 
     @Override
     protected void attachBaseContext(Context base) {
-        Security.insertProviderAt(Conscrypt.newProvider(), 1);
         super.attachBaseContext(base);
         Init.set(base);
     }

catvod/build.gradle

@@ -13,11 +13,11 @@ 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
     api 'com.squareup.okhttp3:okhttp-dnsoverhttps:' + okhttpVersion
-    api 'org.jsoup:jsoup:' + jsoupVersion
 }

catvod/src/main/java/com/github/catvod/net/OkHttp.java

@@ -9,7 +9,10 @@ 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;
@@ -54,6 +57,10 @@ 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();

quickjs/build.gradle

@@ -13,6 +13,7 @@ android {
 
 dependencies {
     implementation project(':catvod')
+    implementation 'org.jsoup:jsoup:' + jsoupVersion
     implementation 'wang.harlon.quickjs:wrapper-java:1.0.0'
     implementation 'net.sourceforge.streamsupport:android-retrofuture:1.7.4'
     implementation(ext: 'aar', name: 'quickjs', group: 'fongmi', version: 'release')