1 files changed, 16 insertions, 2 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java
index 33202d0a4..9b62c2cf2 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java
@@ -33,6 +33,10 @@ import androidx.preference.PreferenceManager;
 import com.vanniktech.emoji.EmojiManager;
 import com.vanniktech.emoji.one.EmojiOneProvider;
 
+import org.conscrypt.Conscrypt;
+
+import java.security.Security;
+
 import app.fedilab.android.R;
 import app.fedilab.android.mastodon.helper.Helper;
 import app.fedilab.android.mastodon.helper.ThemeHelper;
@@ -44,14 +48,24 @@ public class BaseActivity extends AppCompatActivity {
     public static int currentThemeId;
 
     static {
-        Helper.installProvider();
         EmojiManager.install(new EmojiOneProvider());
     }
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
-
+        boolean patch_provider = true;
         final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        try {
+            patch_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true);
+        } catch (Exception ignored) {
+        }
+        if (patch_provider) {
+            try {
+                Security.insertProviderAt(Conscrypt.newProvider(), 1);
+            } catch (Exception ignored) {
+            }
+        }
+
         String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));
         //Default automatic switch
         if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {