From 168f9025714a63b0716d6c3c32d79630ad7dd4e4 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 17 Nov 2020 19:17:14 +0100 Subject: [PATCH] Report key import errors --- app/src/main/java/eu/faircode/email/ActivitySetup.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index ef77e78882..c0aef004f4 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -78,7 +78,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.security.SecureRandom; -import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.security.spec.KeySpec; @@ -1121,14 +1120,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac @Override protected void onException(Bundle args, Throwable ex) { - if (ex instanceof IllegalArgumentException) - ToastEx.makeText(ActivitySetup.this, ex.getMessage(), Toast.LENGTH_LONG).show(); - else if (ex instanceof IllegalStateException || - ex instanceof FileNotFoundException || - ex instanceof CertificateException) - ToastEx.makeText(ActivitySetup.this, R.string.title_invalid_key, Toast.LENGTH_LONG).show(); - else - Log.unexpectedError(getSupportFragmentManager(), ex); + Log.unexpectedError(getSupportFragmentManager(), ex, false); } }.execute(this, args, "setup:cert"); }