From 329a557fa5da6c500f850a4c68d5dfd507679c9b Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 30 Jan 2021 08:56:32 +0100 Subject: [PATCH] Invalid key file is an expected error --- app/src/main/java/eu/faircode/email/ActivitySetup.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index b90b4b0564..0b46827e84 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -1121,7 +1121,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac // throws DecoderException extends IllegalStateException PemObject pem = new PemReader(new InputStreamReader(is)).readPemObject(); if (pem == null) - throw new IllegalStateException("Invalid key file"); + throw new IllegalArgumentException("Invalid key file"); ByteArrayInputStream bis = new ByteArrayInputStream(pem.getContent()); cert = (X509Certificate) fact.generateCertificate(bis); } @@ -1147,7 +1147,9 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac @Override protected void onException(Bundle args, Throwable ex) { - boolean expected = (ex instanceof SecurityException); + boolean expected = + (ex instanceof IllegalArgumentException || + ex instanceof SecurityException); Log.unexpectedError(getSupportFragmentManager(), ex, !expected); } }.execute(this, args, "setup:cert");