From ef54df79bcf933a83c1624bff270bdd06fc4655d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 11 Nov 2018 11:24:34 +0000
Subject: [PATCH] Confirm showing original message

---
 .../eu/faircode/email/AdapterMessage.java     | 27 ++++++++++++++-----
 app/src/main/res/values/strings.xml           |  1 +
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index a469a516e9..e212053ceb 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -525,13 +525,9 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             else if (viewType == ViewType.THREAD) {
                 if (view.getId() == R.id.ivExpanderAddress)
                     onToggleAddresses(pos, message);
-                else if (view.getId() == R.id.btnHtml) {
-                    LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
-                    lbm.sendBroadcast(
-                            new Intent(ActivityView.ACTION_VIEW_FULL)
-                                    .putExtra("id", message.id)
-                                    .putExtra("from", MessageHelper.getFormattedAddresses(message.from, true)));
-                } else if (view.getId() == R.id.btnImages)
+                else if (view.getId() == R.id.btnHtml)
+                    onShowHtml(message);
+                else if (view.getId() == R.id.btnImages)
                     onShowImages(message);
                 else
                     onToggleMessage(pos, message);
@@ -611,6 +607,23 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             notifyItemChanged(pos);
         }
 
+        private void onShowHtml(final EntityMessage message) {
+            new DialogBuilderLifecycle(context, owner)
+                    .setMessage(R.string.title_ask_show_html)
+                    .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
+                            lbm.sendBroadcast(
+                                    new Intent(ActivityView.ACTION_VIEW_FULL)
+                                            .putExtra("id", message.id)
+                                            .putExtra("from", MessageHelper.getFormattedAddresses(message.from, true)));
+                        }
+                    })
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .show();
+        }
+
         private void onShowImages(EntityMessage message) {
             properties.setImages(message.id, true);
             btnImages.setEnabled(false);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f617a47ca1..1526433918 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -223,6 +223,7 @@
     <string name="title_ask_delete_answer">Delete reply template permanently?</string>
     <string name="title_ask_discard">Discard draft?</string>
     <string name="title_ask_spam">Report message as spam?</string>
+    <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
     <string name="title_fix">Fix</string>
 
     <string name="title_compose">Compose %1$s</string>