From 8a7c3e742d9e8d06020594eb1871ae4f78d27861 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 19 Jan 2023 11:04:08 +0100
Subject: [PATCH] Added option for default answer action

---
 .../java/eu/faircode/email/FragmentMessages.java   |  6 +++++-
 .../eu/faircode/email/FragmentOptionsSend.java     | 13 ++++++++++++-
 app/src/main/res/layout/fragment_options_send.xml  | 14 +++++++++++++-
 app/src/main/res/values/strings.xml                |  1 +
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index cf211c2528..54c09565f9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3356,8 +3356,12 @@ public class FragmentMessages extends FragmentBase
             if (message == null)
                 return;
 
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+            boolean answer_default = prefs.getBoolean("answer_default", false);
+            if (answer_default)
+                long_press = !long_press;
+
             if (long_press && message.content) {
-                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
                 String answer_action = prefs.getString("answer_action", "reply");
                 if ("reply".equals(answer_action) ||
                         "reply_all".equals(answer_action) ||
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
index c707cec362..78285d6b74 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
@@ -79,6 +79,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
     private SwitchCompat swDiscardDelete;
     private Spinner spSendDelayed;
     private Spinner spAnswerAction;
+    private SwitchCompat swAnswerDefault;
     private Button btnSound;
 
     private ViewButtonColor btnComposeColor;
@@ -121,7 +122,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
             "send_reminders", "send_chips", "send_pending",
             "auto_save_paragraph", "auto_save_dot", "discard_delete",
             "send_delayed",
-            "answer_action",
+            "answer_action", "answer_default",
             "sound_sent",
             "compose_color", "compose_font",
             "prefix_once", "prefix_count", "alt_re", "alt_fwd",
@@ -161,6 +162,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
         swDiscardDelete = view.findViewById(R.id.swDiscardDelete);
         spSendDelayed = view.findViewById(R.id.spSendDelayed);
         spAnswerAction = view.findViewById(R.id.spAnswerAction);
+        swAnswerDefault = view.findViewById(R.id.swAnswerDefault);
         btnSound = view.findViewById(R.id.btnSound);
 
         btnComposeColor = view.findViewById(R.id.btnComposeColor);
@@ -356,6 +358,13 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
             }
         });
 
+        swAnswerDefault.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("answer_default", checked).apply();
+            }
+        });
+
         btnSound.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -735,6 +744,8 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
                 break;
             }
 
+        swAnswerDefault.setChecked(prefs.getBoolean("answer_default", false));
+
         btnComposeColor.setColor(prefs.getInt("compose_color", Color.TRANSPARENT));
 
         String compose_font = prefs.getString("compose_font", "");
diff --git a/app/src/main/res/layout/fragment_options_send.xml b/app/src/main/res/layout/fragment_options_send.xml
index 24fc3f53bc..9ea1b473ee 100644
--- a/app/src/main/res/layout/fragment_options_send.xml
+++ b/app/src/main/res/layout/fragment_options_send.xml
@@ -345,6 +345,18 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvAnswerAction" />
 
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/swAnswerDefault"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="24dp"
+                    android:layout_marginTop="12dp"
+                    android:text="@string/title_advanced_answer_default"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/spAnswerAction"
+                    app:switchPadding="12dp" />
+
                 <Button
                     android:id="@+id/btnSound"
                     style="?android:attr/buttonStyleSmall"
@@ -355,7 +367,7 @@
                     android:drawablePadding="6dp"
                     android:text="@string/title_advanced_sound"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/spAnswerAction" />
+                    app:layout_constraintTop_toBottomOf="@id/swAnswerDefault" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c7fc4d7304..682775131d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -436,6 +436,7 @@
     <string name="title_advanced_send_delayed">Delay sending messages</string>
     <string name="title_advanced_attach_new">Add shared files to a new draft</string>
     <string name="title_advanced_answer_action">Long pressing on the answer button will:</string>
+    <string name="title_advanced_answer_default">Use this as the default answer action</string>
     <string name="title_advanced_send_pending">Show non-obtrusive send delayed icon</string>
 
     <string name="title_advanced_auto_save_paragraph">Automatically save a draft after every paragraph</string>