From 522af0c756246a13cdf41d8439a304651de964eb Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 4 Jan 2021 17:53:07 +0100 Subject: [PATCH] Expected exceptions --- .../java/eu/faircode/email/ActivitySetup.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index cf2bef2f57..b90b4b0564 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -686,11 +686,11 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac @Override protected void onException(Bundle args, Throwable ex) { - if (ex instanceof IllegalArgumentException || - ex instanceof FileNotFoundException) - ToastEx.makeText(ActivitySetup.this, ex.getMessage(), Toast.LENGTH_LONG).show(); - else - Log.unexpectedError(getSupportFragmentManager(), ex); + boolean expected = + (ex instanceof IllegalArgumentException || + ex instanceof FileNotFoundException || + ex instanceof SecurityException); + Log.unexpectedError(getSupportFragmentManager(), ex, !expected); } }.execute(this, args, "setup:export"); } @@ -1073,12 +1073,14 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac ToastEx.makeText(ActivitySetup.this, R.string.title_setup_password_invalid, Toast.LENGTH_LONG).show(); else if (ex instanceof IOException && ex.getCause() instanceof IllegalBlockSizeException) ToastEx.makeText(ActivitySetup.this, R.string.title_setup_import_invalid, Toast.LENGTH_LONG).show(); - else if (ex instanceof IllegalArgumentException || - ex instanceof FileNotFoundException || - ex instanceof JSONException) - ToastEx.makeText(ActivitySetup.this, ex.getMessage(), Toast.LENGTH_LONG).show(); - else - Log.unexpectedError(getSupportFragmentManager(), ex); + else { + boolean expected = + (ex instanceof IllegalArgumentException || + ex instanceof FileNotFoundException || + ex instanceof JSONException || + ex instanceof SecurityException); + Log.unexpectedError(getSupportFragmentManager(), ex, !expected); + } } }.execute(this, args, "setup:import"); } @@ -1145,7 +1147,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac @Override protected void onException(Bundle args, Throwable ex) { - Log.unexpectedError(getSupportFragmentManager(), ex, false); + boolean expected = (ex instanceof SecurityException); + Log.unexpectedError(getSupportFragmentManager(), ex, !expected); } }.execute(this, args, "setup:cert"); }