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

Expected exceptions

This commit is contained in:
M66B 2021-01-04 17:53:07 +01:00
parent 6c00f0e922
commit 522af0c756
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/eu/faircode/email/ActivitySetup.java
View File

@ -686,11 +686,11 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
@Override @Override
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
if (ex instanceof IllegalArgumentException || boolean expected =
ex instanceof FileNotFoundException) (ex instanceof IllegalArgumentException ||
ToastEx.makeText(ActivitySetup.this, ex.getMessage(), Toast.LENGTH_LONG).show(); ex instanceof FileNotFoundException ||
else ex instanceof SecurityException);
Log.unexpectedError(getSupportFragmentManager(), ex); Log.unexpectedError(getSupportFragmentManager(), ex, !expected);
} }
}.execute(this, args, "setup:export"); }.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(); ToastEx.makeText(ActivitySetup.this, R.string.title_setup_password_invalid, Toast.LENGTH_LONG).show();
else if (ex instanceof IOException && ex.getCause() instanceof IllegalBlockSizeException) else if (ex instanceof IOException && ex.getCause() instanceof IllegalBlockSizeException)
ToastEx.makeText(ActivitySetup.this, R.string.title_setup_import_invalid, Toast.LENGTH_LONG).show(); ToastEx.makeText(ActivitySetup.this, R.string.title_setup_import_invalid, Toast.LENGTH_LONG).show();
else if (ex instanceof IllegalArgumentException || else {
boolean expected =
(ex instanceof IllegalArgumentException ||
ex instanceof FileNotFoundException || ex instanceof FileNotFoundException ||
ex instanceof JSONException) ex instanceof JSONException ||
ToastEx.makeText(ActivitySetup.this, ex.getMessage(), Toast.LENGTH_LONG).show(); ex instanceof SecurityException);
else Log.unexpectedError(getSupportFragmentManager(), ex, !expected);
Log.unexpectedError(getSupportFragmentManager(), ex); }
} }
}.execute(this, args, "setup:import"); }.execute(this, args, "setup:import");
} }
@ -1145,7 +1147,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
@Override @Override
protected void onException(Bundle args, Throwable ex) { 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"); }.execute(this, args, "setup:cert");
} }