From 7e44ffc915fc6912eed60a15ec4a9aa530ddf1f4 Mon Sep 17 00:00:00 2001
From: MrLetsplay <mr@cringe-studios.com>
Date: Fri, 29 Sep 2023 22:55:04 +0200
Subject: [PATCH] Add better error dialog

---
 .../cringe_authenticator/util/DialogUtil.java | 51 ++++++++++++++++---
 app/src/main/res/layout/dialog_error.xml      | 44 ++++++++++++++++
 2 files changed, 89 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/layout/dialog_error.xml

diff --git a/app/src/main/java/com/cringe_studios/cringe_authenticator/util/DialogUtil.java b/app/src/main/java/com/cringe_studios/cringe_authenticator/util/DialogUtil.java
index dd4d4e7..2ff0cdf 100644
--- a/app/src/main/java/com/cringe_studios/cringe_authenticator/util/DialogUtil.java
+++ b/app/src/main/java/com/cringe_studios/cringe_authenticator/util/DialogUtil.java
@@ -14,6 +14,7 @@ import androidx.core.util.Consumer;
 import com.cringe_studios.cringe_authenticator.R;
 import com.cringe_studios.cringe_authenticator.backup.BackupData;
 import com.cringe_studios.cringe_authenticator.databinding.DialogCreateGroupBinding;
+import com.cringe_studios.cringe_authenticator.databinding.DialogErrorBinding;
 import com.cringe_studios.cringe_authenticator.databinding.DialogInputCodeHotpBinding;
 import com.cringe_studios.cringe_authenticator.databinding.DialogInputCodeTotpBinding;
 import com.cringe_studios.cringe_authenticator.databinding.DialogInputPasswordBinding;
@@ -48,13 +49,36 @@ public class DialogUtil {
         dialog.show();
     }
 
-    public static void showErrorDialog(Context context, String errorMessage, Runnable closed) {
-        new StyledDialogBuilder(context)
+    public static void showErrorDialog(Context context, String errorMessage, String details, Runnable closed) {
+        DialogErrorBinding binding = DialogErrorBinding.inflate(LayoutInflater.from(context));
+
+        binding.errorMessage.setText(errorMessage);
+
+        AlertDialog.Builder b = new StyledDialogBuilder(context)
                 .setTitle(R.string.failed_title)
-                .setMessage(errorMessage)
+                .setView(binding.getRoot())
                 .setPositiveButton(R.string.ok, (d, which) -> {})
-                .setOnDismissListener(d -> { if(closed != null) closed.run(); })
-                .show();
+                .setOnDismissListener(d -> { if(closed != null) closed.run(); });
+
+        if(details != null) {
+            binding.errorDetailsText.setText(details);
+            b.setNeutralButton("Details", (d, which) -> {});
+        }
+
+        AlertDialog dialog = b.create();
+
+        if(details != null) {
+            dialog.setOnShowListener(d -> {
+                Button detailsButton = dialog.getButton(AlertDialog.BUTTON_NEUTRAL);
+                detailsButton.setOnClickListener(v -> binding.errorDetails.setVisibility(binding.errorDetails.getVisibility() == View.VISIBLE ? View.GONE : View.VISIBLE));
+            });
+        }
+
+        dialog.show();
+    }
+
+    public static void showErrorDialog(Context context, String errorMessage, Runnable closed) {
+        showErrorDialog(context, errorMessage, null, closed);
     }
 
     public static void showErrorDialog(Context context, String errorMessage) {
@@ -62,7 +86,22 @@ public class DialogUtil {
     }
 
     public static void showErrorDialog(Context context, String errorMessage, Exception exception) {
-        showErrorDialog(context, errorMessage + ": " + exception.toString(), (Runnable) null); // TODO: exception details button
+        showErrorDialog(context, errorMessage, stackTraceToString(exception), (Runnable) null);
+    }
+
+    private static String stackTraceToString(Throwable t) {
+        StringBuilder b = new StringBuilder();
+
+        b.append(t.toString()).append('\n');
+        for(StackTraceElement e : t.getStackTrace()) {
+            b.append("    ").append(e.toString()).append('\n');
+        }
+
+        if(t.getCause() != null) {
+            b.append("Caused by: ").append(stackTraceToString(t.getCause()));
+        }
+
+        return b.toString().trim();
     }
 
     public static void showTOTPDialog(LayoutInflater inflater, OTPData initialData, Consumer<OTPData> callback, boolean view) {
diff --git a/app/src/main/res/layout/dialog_error.xml b/app/src/main/res/layout/dialog_error.xml
new file mode 100644
index 0000000..5db082b
--- /dev/null
+++ b/app/src/main/res/layout/dialog_error.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/error_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:text="Failed to do the thing you wanted to do" />
+
+    <LinearLayout
+        android:id="@+id/error_details"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Details"
+            android:textStyle="bold" />
+
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/error_details_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="Lorem ipsum dolor sit amet something went wrong and we don't know why" />
+        </HorizontalScrollView>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file