mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed Android 5 signature error

This commit is contained in:
M66B 2021-09-22 22:55:39 +02:00
parent 5aa128b156
commit ee98128635
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/eu/faircode/email/EncryptionHelper.java
View File

@ -20,6 +20,7 @@ package eu.faircode.email;
*/ */
import android.content.Context; import android.content.Context;
import android.os.Build;
import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.jce.provider.BouncyCastleProvider;
@ -28,19 +29,31 @@ import java.security.Security;
public class EncryptionHelper { public class EncryptionHelper {
static { static {
try { /*
Provider[] providers = Security.getProviders(); Caused by: java.lang.SecurityException: Incorrect signature
for (int p = 0; p < providers.length; p++) at org.apache.harmony.security.utils.JarUtils.verifySignature(JarUtils.java:223)
if (BouncyCastleProvider.PROVIDER_NAME.equals(providers[p].getName())) { at java.util.jar.JarVerifier.verifyCertificate(JarVerifier.java:294)
Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME); at java.util.jar.JarVerifier.readCertificates(JarVerifier.java:268)
Provider bc = new BouncyCastleProvider(); at java.util.jar.JarFile.getInputStream(JarFile.java:380)
Security.insertProviderAt(bc, p + 1); at libcore.net.url.JarURLConnectionImpl.getInputStream(JarURLConnectionImpl.java:222)
Log.i("Replacing security provider " + providers[p] + " at " + p + " by " + bc); at java.net.URL.openStream(URL.java:470)
break; at java.lang.ClassLoader.getResourceAsStream(ClassLoader.java:444)
} at java.lang.Class.getResourceAsStream(Class.java:1334)
} catch (Throwable ex) { */
Log.e(ex); if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1)
} 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) { static void init(Context context) {