From 42cfd1ccdc9a2d9276a27c3df7f028e8e782714f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 24 Apr 2021 20:37:37 +0200
Subject: [PATCH] Long press to answer sender

---
 FAQ.md                                         |  1 +
 .../eu/faircode/email/FragmentMessages.java    | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index 6d80817b1d..8cc4c038eb 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1899,6 +1899,7 @@ but even Google's Chrome cannot handle this.
 * Did you know that you can long press the trash icons (both in the message and the bottom action bar) to permanently delete a message or conversation? (version 1.1368+)
 * Did you know that you can long press the send action to show the send dialog, even if it was disabled?
 * Did you know that you can long press the full screen icon to show the original message text only?
+* Did you know that you can long press the answer button to reply to the sender? (since version 1.1562)
 
 <br />
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 5b7d2ddcf8..76a690df10 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -936,7 +936,15 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         fabReply.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                onReply();
+                onReply(false);
+            }
+        });
+
+        fabReply.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                onReply(true);
+                return true;
             }
         });
 
@@ -2366,7 +2374,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         }
     };
 
-    private void onReply() {
+    private void onReply(boolean sender) {
         if (values.containsKey("expanded") && values.get("expanded").size() > 0) {
             long id = values.get("expanded").get(0);
             int pos = adapter.getPositionForKey(id);
@@ -2376,7 +2384,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             String selected = (holder == null ? null : holder.getSelectedText());
             if (message == null)
                 return;
-            onReply(message, selected, fabReply);
+
+            if (sender && message.content)
+                onMenuReply(message, "reply", selected);
+            else
+                onReply(message, selected, fabReply);
         }
     }