From 3ccf210e62c1ee49cb0477f59bc98dc08691e497 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 19 Nov 2020 10:49:37 +0100
Subject: [PATCH] Added open full confirmation dialog

---
 .../eu/faircode/email/AdapterMessage.java     | 29 +++++++++++++++++++
 .../faircode/email/FragmentOptionsMisc.java   |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 8ba009b143..e5dbdbed5e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3716,6 +3716,35 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private void onActionOpenFull(final TupleMessageEx message) {
+            boolean open_full_confirmed = prefs.getBoolean("open_full_confirmed", false);
+            if (open_full_confirmed)
+                onActionOpenFullConfirmed(message);
+            else {
+                LayoutInflater inflater = LayoutInflater.from(context);
+                View dview = inflater.inflate(R.layout.dialog_ask_again, null, false);
+                final TextView tvMessage = dview.findViewById(R.id.tvMessage);
+                final TextView tvRemark = dview.findViewById(R.id.tvRemark);
+                final CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
+
+                tvMessage.setText(R.string.title_ask_show_html);
+                tvRemark.setText(R.string.title_ask_show_image_hint);
+
+                new AlertDialog.Builder(context)
+                        .setView(dview)
+                        .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                if (cbNotAgain.isChecked())
+                                    prefs.edit().putBoolean("open_full_confirmed", true).apply();
+                                onActionOpenFullConfirmed(message);
+                            }
+                        })
+                        .setNegativeButton(android.R.string.cancel, null)
+                        .show();
+            }
+        }
+
+        private void onActionOpenFullConfirmed(final TupleMessageEx message) {
             Bundle args = new Bundle();
             args.putLong("id", message.id);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 43586855e8..7d03b61bdc 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -124,7 +124,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
     private final static String[] RESET_QUESTIONS = new String[]{
             "welcome", "first", "app_support", "notify_archive", "message_swipe", "message_select", "folder_actions", "folder_sync",
             "crash_reports_asked", "review_asked", "review_later", "why",
-            "reply_hint", "html_always_images", "print_html_confirmed", "reformatted_hint",
+            "reply_hint", "html_always_images", "open_full_confirmed", "print_html_confirmed", "reformatted_hint",
             "selected_folders", "move_1_confirmed", "move_n_confirmed",
             "last_search_senders", "last_search_recipients", "last_search_subject", "last_search_keywords", "last_search_message", "last_search",
             "identities_asked", "cc_bcc", "inline_image_hint", "compose_reference", "send_dialog",