From 8fe004799893147d283f917c362ae064c8309d4f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 12 Sep 2021 15:43:40 +0200
Subject: [PATCH] Provide latest version of Bouncy Castle

---
 .../java/eu/faircode/email/ApplicationEx.java | 22 +-------
 .../eu/faircode/email/EncryptionHelper.java   | 50 +++++++++++++++++++
 2 files changed, 51 insertions(+), 21 deletions(-)
 create mode 100644 app/src/main/java/eu/faircode/email/EncryptionHelper.java

diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index c9b6bb084e..d8e081b90d 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -42,10 +42,6 @@ import androidx.annotation.Nullable;
 import androidx.preference.PreferenceManager;
 import androidx.work.WorkManager;
 
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-import java.security.Provider;
-import java.security.Security;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Locale;
@@ -55,23 +51,6 @@ public class ApplicationEx extends Application
         implements SharedPreferences.OnSharedPreferenceChangeListener {
     private Thread.UncaughtExceptionHandler prev = null;
 
-    static {
-        if (BuildConfig.DEBUG)
-            try {
-                Provider[] providers = Security.getProviders();
-                for (int p = 0; p < providers.length; p++)
-                    if (BouncyCastleProvider.PROVIDER_NAME.equals(providers[p].getName())) {
-                        Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
-                        Provider bc = new BouncyCastleProvider();
-                        Security.insertProviderAt(bc, p + 1);
-                        Log.i("Replacing provider " + providers[p] + " at " + p + " by " + bc);
-                        break;
-                    }
-            } catch (Throwable ex) {
-                Log.e(ex);
-            }
-    }
-
     @Override
     protected void attachBaseContext(Context base) {
         super.attachBaseContext(getLocalizedContext(base));
@@ -210,6 +189,7 @@ public class ApplicationEx extends Application
         if (Helper.hasWebView(this))
             CookieManager.getInstance().setAcceptCookie(false);
 
+        EncryptionHelper.init(this);
         MessageHelper.setSystemProperties(this);
 
         ContactInfo.init(this);
diff --git a/app/src/main/java/eu/faircode/email/EncryptionHelper.java b/app/src/main/java/eu/faircode/email/EncryptionHelper.java
new file mode 100644
index 0000000000..687ba1d42c
--- /dev/null
+++ b/app/src/main/java/eu/faircode/email/EncryptionHelper.java
@@ -0,0 +1,50 @@
+package eu.faircode.email;
+
+/*
+    This file is part of FairEmail.
+
+    FairEmail is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    FairEmail is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
+
+    Copyright 2018-2021 by Marcel Bokhorst (M66B)
+*/
+
+import android.content.Context;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+import java.security.Provider;
+import java.security.Security;
+
+public class EncryptionHelper {
+    static {
+        try {
+            Provider[] providers = Security.getProviders();
+            for (int p = 0; p < providers.length; p++)
+                if (BouncyCastleProvider.PROVIDER_NAME.equals(providers[p].getName())) {
+                    Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
+                    Provider bc = new BouncyCastleProvider();
+                    Security.insertProviderAt(bc, p + 1);
+                    Log.i("Replacing security provider " + providers[p] + " at " + p + " by " + bc);
+                    break;
+                }
+        } catch (Throwable ex) {
+            Log.e(ex);
+        }
+    }
+
+    static void init(Context context) {
+
+    }
+}
+