From 27895a12226f698b2e7a1fd82ca5bff8bd41fec5 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 22 Nov 2023 18:07:10 +0800
Subject: [PATCH] Remove conscrypt

---
 app/build.gradle                                 | 3 +--
 app/src/main/java/com/fongmi/android/tv/App.java | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ea3401b97..3687082d3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdk 21
         targetSdk 28
         versionCode 208
-        versionName "20231122"
+        versionName "20231122#2"
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
@@ -118,7 +118,6 @@ 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 d9097358e..6c7aa6bed 100644
--- a/app/src/main/java/com/fongmi/android/tv/App.java
+++ b/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;
 
@@ -42,10 +39,6 @@ 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);