From 1cc3d79ce9d0346be5957a8d60882a38e300aa09 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 15 Sep 2018 05:49:54 +0000
Subject: [PATCH] Unexpected error handling

---
 .../main/java/eu/faircode/email/ActivityBilling.java   |  3 +--
 app/src/main/java/eu/faircode/email/ActivityView.java  |  8 ++++----
 app/src/main/java/eu/faircode/email/AdapterFolder.java |  3 +--
 .../main/java/eu/faircode/email/AdapterMessage.java    |  3 +--
 app/src/main/java/eu/faircode/email/FragmentAbout.java |  3 +--
 .../main/java/eu/faircode/email/FragmentAccount.java   |  9 ++++-----
 .../main/java/eu/faircode/email/FragmentAnswer.java    |  5 ++---
 .../main/java/eu/faircode/email/FragmentCompose.java   |  8 ++++----
 .../main/java/eu/faircode/email/FragmentFolder.java    |  5 ++---
 .../main/java/eu/faircode/email/FragmentIdentity.java  |  5 ++---
 .../main/java/eu/faircode/email/FragmentMessage.java   | 10 +++++-----
 .../main/java/eu/faircode/email/FragmentMessages.java  |  7 +++----
 app/src/main/java/eu/faircode/email/FragmentSetup.java |  7 +++----
 app/src/main/java/eu/faircode/email/Helper.java        | 10 ++++++++++
 app/src/main/res/values/strings.xml                    |  1 +
 15 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityBilling.java b/app/src/main/java/eu/faircode/email/ActivityBilling.java
index 4fd5b7a1..36a3ebd3 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBilling.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBilling.java
@@ -12,7 +12,6 @@ import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.View;
-import android.widget.Toast;
 
 import com.android.billingclient.api.BillingClient;
 import com.android.billingclient.api.BillingClientStateListener;
@@ -144,7 +143,7 @@ abstract class ActivityBilling extends ActivityBase implements PurchasesUpdatedL
             setIntent(intent);
         } catch (NoSuchAlgorithmException ex) {
             Log.e(Helper.TAG, Log.getStackTraceString(ex));
-            Toast.makeText(this, ex.getMessage(), Toast.LENGTH_LONG).show();
+            Helper.unexpectedError(this, ex);
         }
     }
 
diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 877c0a7c..0191098c 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -466,7 +466,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
-                    Toast.makeText(ActivityView.this, ex.toString(), Toast.LENGTH_LONG).show();
+                    Helper.unexpectedError(ActivityView.this, ex);
                 }
             }.load(this, args);
         }
@@ -553,7 +553,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
             @Override
             protected void onException(Bundle args, Throwable ex) {
                 if (BuildConfig.DEBUG)
-                    Toast.makeText(ActivityView.this, ex.toString(), Toast.LENGTH_LONG).show();
+                    Helper.unexpectedError(ActivityView.this, ex);
             }
         }.load(this, new Bundle());
     }
@@ -783,7 +783,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Toast.makeText(ActivityView.this, ex.toString(), Toast.LENGTH_LONG).show();
+                Helper.unexpectedError(ActivityView.this, ex);
             }
         }.load(ActivityView.this, intent.getExtras());
     }
@@ -874,7 +874,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
                         Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
-                        Toast.makeText(ActivityView.this, ex.toString(), Toast.LENGTH_LONG).show();
+                        Helper.unexpectedError(ActivityView.this, ex);
                     }
                 }.load(this, args);
             }
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 9a9d7a85..4f27bacc 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -31,7 +31,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import java.text.Collator;
 import java.util.ArrayList;
@@ -204,7 +203,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
 
                                 @Override
                                 public void onException(Bundle args, Throwable ex) {
-                                    Toast.makeText(context, ex.toString(), Toast.LENGTH_LONG).show();
+                                    Helper.unexpectedError(context, ex);
                                 }
                             }.load(context, owner, args);
 
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 8c9bdc9c..8f0051a2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -44,7 +44,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import java.io.InputStream;
 import java.text.DateFormat;
@@ -328,7 +327,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
 
                         @Override
                         public void onException(Bundle args, Throwable ex) {
-                            Toast.makeText(context, ex.toString(), Toast.LENGTH_LONG).show();
+                            Helper.unexpectedError(context, ex);
                         }
                     }.load(context, owner, args);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentAbout.java b/app/src/main/java/eu/faircode/email/FragmentAbout.java
index 0a9feefb..18ec23c0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAbout.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAbout.java
@@ -29,7 +29,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -242,7 +241,7 @@ public class FragmentAbout extends FragmentEx {
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
                         btnDebugInfo.setEnabled(true);
-                        Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                        Helper.unexpectedError(getContext(), ex);
                     }
                 }.load(FragmentAbout.this, new Bundle());
             }
diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 8311ab4f..3ef0caa5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -54,7 +54,6 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.ScrollView;
 import android.widget.Spinner;
-import android.widget.Toast;
 
 import com.android.colorpicker.ColorPickerDialog;
 import com.android.colorpicker.ColorPickerSwatch;
@@ -492,7 +491,7 @@ public class FragmentAccount extends FragmentEx {
 
                         new AlertDialog.Builder(getContext())
                                 .setMessage(Helper.formatThrowable(ex))
-                                .setPositiveButton(android.R.string.ok, null)
+                                .setPositiveButton(android.R.string.cancel, null)
                                 .create()
                                 .show();
                     }
@@ -697,7 +696,7 @@ public class FragmentAccount extends FragmentEx {
 
                         new AlertDialog.Builder(getContext())
                                 .setMessage(Helper.formatThrowable(ex))
-                                .setPositiveButton(android.R.string.ok, null)
+                                .setPositiveButton(android.R.string.cancel, null)
                                 .create()
                                 .show();
                     }
@@ -738,7 +737,7 @@ public class FragmentAccount extends FragmentEx {
 
                                     @Override
                                     protected void onException(Bundle args, Throwable ex) {
-                                        Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                                        Helper.unexpectedError(getContext(), ex);
                                     }
                                 }.load(FragmentAccount.this, args);
                             }
@@ -936,7 +935,7 @@ public class FragmentAccount extends FragmentEx {
                                             tilPassword.getEditText().setText(token);
                                         } catch (Throwable ex) {
                                             Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
-                                            Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                                            Helper.unexpectedError(getContext(), ex);
                                         } finally {
                                             snackbar.dismiss();
                                         }
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
index d39660a1..12feb0aa 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
@@ -28,7 +28,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.ProgressBar;
-import android.widget.Toast;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
@@ -130,7 +129,7 @@ public class FragmentAnswer extends FragmentEx {
             @Override
             protected void onException(Bundle args, Throwable ex) {
                 Helper.setViewsEnabled(view, true);
-                Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                Helper.unexpectedError(getContext(), ex);
             }
         }.load(this, args);
     }
@@ -174,7 +173,7 @@ public class FragmentAnswer extends FragmentEx {
             @Override
             protected void onException(Bundle args, Throwable ex) {
                 Helper.setViewsEnabled(view, true);
-                Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                Helper.unexpectedError(getContext(), ex);
             }
         }.load(this, args);
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index fdb86e03..c1bc5f60 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -541,7 +541,7 @@ public class FragmentCompose extends FragmentEx {
             }
         } catch (Throwable ex) {
             Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex));
-            Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+            Helper.unexpectedError(getContext(), ex);
         } finally {
             if (cursor != null)
                 cursor.close();
@@ -586,7 +586,7 @@ public class FragmentCompose extends FragmentEx {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                Helper.unexpectedError(getContext(), ex);
             }
         }.load(this, args);
     }
@@ -1058,7 +1058,7 @@ public class FragmentCompose extends FragmentEx {
 
         @Override
         protected void onException(Bundle args, Throwable ex) {
-            Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+            Helper.unexpectedError(getContext(), ex);
         }
     };
 
@@ -1209,7 +1209,7 @@ public class FragmentCompose extends FragmentEx {
             if (ex instanceof IllegalArgumentException)
                 Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
             else
-                Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                Helper.unexpectedError(getContext(), ex);
         }
     };
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index 13662ce4..2b44a1fb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -32,7 +32,6 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ProgressBar;
-import android.widget.Toast;
 
 import com.google.android.material.snackbar.Snackbar;
 import com.sun.mail.imap.IMAPFolder;
@@ -193,7 +192,7 @@ public class FragmentFolder extends FragmentEx {
                         if (ex instanceof IllegalArgumentException)
                             Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                         else
-                            Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                            Helper.unexpectedError(getContext(), ex);
                     }
                 }.load(FragmentFolder.this, args);
             }
@@ -266,7 +265,7 @@ public class FragmentFolder extends FragmentEx {
                                         if (ex instanceof IllegalArgumentException)
                                             Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show();
                                         else
-                                            Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                                            Helper.unexpectedError(getContext(), ex);
                                     }
                                 }.load(FragmentFolder.this, args);
                             }
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 1b881961..7e8f950a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -35,7 +35,6 @@ import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import android.widget.Spinner;
-import android.widget.Toast;
 
 import com.google.android.material.textfield.TextInputLayout;
 
@@ -340,7 +339,7 @@ public class FragmentIdentity extends FragmentEx {
 
                         new AlertDialog.Builder(getContext())
                                 .setMessage(Helper.formatThrowable(ex))
-                                .setPositiveButton(android.R.string.ok, null)
+                                .setPositiveButton(android.R.string.cancel, null)
                                 .create()
                                 .show();
                     }
@@ -379,7 +378,7 @@ public class FragmentIdentity extends FragmentEx {
 
                                     @Override
                                     protected void onException(Bundle args, Throwable ex) {
-                                        Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                                        Helper.unexpectedError(getContext(), ex);
                                     }
                                 }.load(FragmentIdentity.this, args);
                             }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java
index bbaf9a77..702c98bb 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessage.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java
@@ -852,7 +852,7 @@ public class FragmentMessage extends FragmentEx {
                             @Override
                             protected void onException(Bundle args, Throwable ex) {
                                 Helper.setViewsEnabled(view, true);
-                                Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                                Helper.unexpectedError(getContext(), ex);
                             }
                         }.load(FragmentMessage.this, args);
                     }
@@ -910,7 +910,7 @@ public class FragmentMessage extends FragmentEx {
                                 @Override
                                 protected void onException(Bundle args, Throwable ex) {
                                     Helper.setViewsEnabled(view, true);
-                                    Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                                    Helper.unexpectedError(getContext(), ex);
                                 }
                             }.load(FragmentMessage.this, args);
                         }
@@ -955,7 +955,7 @@ public class FragmentMessage extends FragmentEx {
                 @Override
                 protected void onException(Bundle args, Throwable ex) {
                     Helper.setViewsEnabled(view, true);
-                    Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                    Helper.unexpectedError(getContext(), ex);
                 }
             }.load(FragmentMessage.this, args);
         }
@@ -1068,7 +1068,7 @@ public class FragmentMessage extends FragmentEx {
                             @Override
                             protected void onException(Bundle args, Throwable ex) {
                                 Helper.setViewsEnabled(view, true);
-                                Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                                Helper.unexpectedError(getContext(), ex);
                             }
                         }.load(FragmentMessage.this, args);
 
@@ -1121,7 +1121,7 @@ public class FragmentMessage extends FragmentEx {
             @Override
             protected void onException(Bundle args, Throwable ex) {
                 Helper.setViewsEnabled(view, true);
-                Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                Helper.unexpectedError(getContext(), ex);
             }
         }.load(FragmentMessage.this, args);
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index cc6934f9..db39ce64 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -38,7 +38,6 @@ import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
@@ -363,7 +362,7 @@ public class FragmentMessages extends FragmentEx {
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
-                        Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                        Helper.unexpectedError(getContext(), ex);
                     }
                 }.load(FragmentMessages.this, args);
             }
@@ -495,7 +494,7 @@ public class FragmentMessages extends FragmentEx {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                Helper.unexpectedError(getContext(), ex);
             }
         }.load(this, args);
     }
@@ -680,7 +679,7 @@ public class FragmentMessages extends FragmentEx {
 
                             @Override
                             public void onError(Context context, Throwable ex) {
-                                Toast.makeText(context, ex.toString(), Toast.LENGTH_LONG).show();
+                                Helper.unexpectedError(context, ex);
                             }
                         });
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index ba0f73e8..0eaf687c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -46,7 +46,6 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.TextView;
-import android.widget.Toast;
 import android.widget.ToggleButton;
 
 import com.google.android.material.snackbar.Snackbar;
@@ -273,7 +272,7 @@ public class FragmentSetup extends FragmentEx {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                Helper.unexpectedError(getContext(), ex);
             }
         }.load(this, new Bundle());
 
@@ -480,7 +479,7 @@ public class FragmentSetup extends FragmentEx {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                Helper.unexpectedError(getContext(), ex);
             }
         }.load(this, args);
     }
@@ -590,7 +589,7 @@ public class FragmentSetup extends FragmentEx {
 
             @Override
             protected void onException(Bundle args, Throwable ex) {
-                Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show();
+                Helper.unexpectedError(getContext(), ex);
             }
         }.load(this, args);
     }
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 23ba0ddd..1397023a 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -52,6 +52,8 @@ import javax.mail.Address;
 import javax.mail.FolderClosedException;
 import javax.mail.internet.InternetAddress;
 
+import androidx.appcompat.app.AlertDialog;
+
 import static android.os.Process.THREAD_PRIORITY_BACKGROUND;
 
 public class Helper {
@@ -122,6 +124,14 @@ public class Helper {
         return sb.toString();
     }
 
+    static void unexpectedError(Context context, Throwable ex) {
+        new AlertDialog.Builder(context)
+                .setTitle(R.string.title_unexpected_error)
+                .setMessage(ex.toString())
+                .setPositiveButton(android.R.string.cancel, null)
+                .show();
+    }
+
     static String humanReadableByteCount(long bytes, boolean si) {
         int unit = si ? 1000 : 1024;
         if (bytes < unit) return bytes + " B";
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f0deb35a..e3e4ecfb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -253,6 +253,7 @@
     <string name="title_pro_invalid">Invalid response</string>
     <string name="title_pro_support">FairEmail needs your help. Tap to purchase pro features to keep the project going.</string>
 
+    <string name="title_unexpected_error">Unexpected error</string>
     <string name="title_log">Log</string>
     <string name="title_debug_info">Debug info</string>
     <string name="title_debug_info_remark">Please describe the problem and indicate the time of the problem:</string>