From 1dae4909c45dc2e11fd0fe1d9a6cae7c7d58a0b1 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 21 Jan 2020 08:16:56 +0100 Subject: [PATCH] Prevent crash --- .../java/eu/faircode/email/FragmentBase.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentBase.java b/app/src/main/java/eu/faircode/email/FragmentBase.java index 211ef2cbb6..9cf81b04fa 100644 --- a/app/src/main/java/eu/faircode/email/FragmentBase.java +++ b/app/src/main/java/eu/faircode/email/FragmentBase.java @@ -382,10 +382,13 @@ public class FragmentBase extends Fragment { @Override protected void onException(Bundle args, Throwable ex) { - if (ex instanceof RecoverableSecurityException && - Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - handle((RecoverableSecurityException) ex); - } else if (ex instanceof IllegalArgumentException || ex instanceof FileNotFoundException) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + if (ex instanceof RecoverableSecurityException) { + handle((RecoverableSecurityException) ex); + return; + } + + if (ex instanceof IllegalArgumentException || ex instanceof FileNotFoundException) ToastEx.makeText(getContext(), ex.getMessage(), Toast.LENGTH_LONG).show(); else Log.unexpectedError(getParentFragmentManager(), ex); @@ -461,11 +464,13 @@ public class FragmentBase extends Fragment { @Override protected void onException(Bundle args, Throwable ex) { - if (ex instanceof RecoverableSecurityException && - Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - handle((RecoverableSecurityException) ex); - } else - Log.unexpectedError(getParentFragmentManager(), ex); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + if (ex instanceof RecoverableSecurityException) { + handle((RecoverableSecurityException) ex); + return; + } + + Log.unexpectedError(getParentFragmentManager(), ex); } }.execute(this, args, "attachments:save"); }