diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java index a5ef814af3..091d1c0f38 100644 --- a/app/src/main/java/eu/faircode/email/ActivityBase.java +++ b/app/src/main/java/eu/faircode/email/ActivityBase.java @@ -460,12 +460,8 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc Log.i("Start intent=" + intent); Log.logExtras(intent); super.startActivity(intent); - } catch (ActivityNotFoundException ex) { - Log.w(ex); - Helper.reportNoViewer(this, intent); } catch (Throwable ex) { - Log.e(ex); - ToastEx.makeText(this, Log.formatThrowable(ex), Toast.LENGTH_LONG).show(); + Helper.reportNoViewer(this, intent, ex); } } @@ -475,15 +471,8 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc Log.i("Start intent=" + intent + " request=" + requestCode); Log.logExtras(intent); super.startActivityForResult(intent, requestCode); - } catch (ActivityNotFoundException ex) { - Log.w(ex); - if (Helper.isTnef(intent.getType(), null)) - Helper.viewFAQ(this, 155); - else - Helper.reportNoViewer(this, intent); } catch (Throwable ex) { - Log.e(ex); - ToastEx.makeText(this, Log.formatThrowable(ex), Toast.LENGTH_LONG).show(); + Helper.reportNoViewer(this, intent, ex); } } diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java index ae748cdfd9..e9d8aadb8b 100644 --- a/app/src/main/java/eu/faircode/email/AdapterAccount.java +++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java @@ -501,9 +501,8 @@ public class AdapterAccount extends RecyclerView.Adapter= 4000) return Integer.toString(value); return ROMAN_1000[value / 1000] + @@ -1671,7 +1678,7 @@ public class Helper { ROMAN_1[value % 10]; } - static ActionMode.Callback getActionModeWrapper(Context context){ + static ActionMode.Callback getActionModeWrapper(Context context) { return new ActionMode.Callback() { @Override public boolean onCreateActionMode(ActionMode mode, Menu menu) { @@ -1691,8 +1698,7 @@ public class Helper { try { context.startActivity(intent); } catch (Throwable ex) { - Log.e(ex); - ToastEx.makeText(context, ex.toString(), Toast.LENGTH_LONG).show(); + reportNoViewer(context, intent, ex); } return true; } diff --git a/app/src/main/res/layout/dialog_no_viewer.xml b/app/src/main/res/layout/dialog_no_viewer.xml index aed3ddb21c..cfe22037c8 100644 --- a/app/src/main/res/layout/dialog_no_viewer.xml +++ b/app/src/main/res/layout/dialog_no_viewer.xml @@ -78,5 +78,17 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvTypeTitle" /> + + \ No newline at end of file