mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-18 21:28:54 +00:00
Code Issues Releases Wiki Activity

Provide latest version of Bouncy Castle

Browse source
This commit is contained in:
M66B 2021-09-12 15:43:40 +02:00
parent decf4dc9d8
commit 8fe0047998
2 changed files with 51 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/eu/faircode/email/ApplicationEx.java
View file

@ -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);

50
app/src/main/java/eu/faircode/email/EncryptionHelper.java Normal file
View file

@ -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) {
}
}