From d56fd11a90982aef497419bf8af5d7cf8dffb21b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 10 Oct 2023 20:57:13 +0200
Subject: [PATCH] Accesibility: trash selection

---
 .../main/java/eu/faircode/email/AdapterMessage.java   | 11 +++++++++++
 .../main/java/eu/faircode/email/FragmentMessages.java | 10 ++++++++++
 app/src/main/res/values/strings.xml                   |  1 +
 3 files changed, 22 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 480178946f..5471c71731 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -7665,6 +7665,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibTrash,
                         context.getString(R.string.title_trash)));
 
+                if (properties.getSelectionCount() > 0)
+                    info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibDelete,
+                            context.getString(R.string.title_trash_selection)));
+
                 if (ibAvatar.getVisibility() == View.VISIBLE && ibAvatar.isEnabled())
                     info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibAvatar,
                             context.getString(R.string.title_accessibility_view_contact)));
@@ -7716,6 +7720,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 } else if (action == R.id.ibTrash) {
                     onActionTrash(message, false);
                     return true;
+                } else if (action == R.id.ibDelete) {
+                    properties.moveSelection(EntityFolder.TRASH, false);
+                    return true;
                 } else if (action == R.id.ibAvatar) {
                     onViewContact(message);
                     return true;
@@ -8930,6 +8937,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         void move(long id, String type);
 
+        int getSelectionCount();
+
+        void moveSelection(String type, boolean block);
+
         void reply(TupleMessageEx message, CharSequence selected, View anchor);
 
         void startSearch(TextView view);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index aee7c9d48d..fdfc72e44a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2735,6 +2735,16 @@ public class FragmentMessages extends FragmentBase
             }.execute(FragmentMessages.this, args, "messages:move");
         }
 
+        @Override
+        public int getSelectionCount() {
+            return getSelection().length;
+        }
+
+        @Override
+        public void moveSelection(String type, boolean block) {
+            onActionMoveSelection(type, block);
+        }
+
         @Override
         public void reply(TupleMessageEx message, CharSequence selected, View anchor) {
             onReply(message, selected, anchor);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9c2502b506..2c0b06eda6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1456,6 +1456,7 @@
     <string name="title_quick_actions_clear">Clear selection after action</string>
 
     <string name="title_trash">Trash</string>
+    <string name="title_trash_selection">Trash selection</string>
     <string name="title_copy">Copy &#8230;</string>
     <string name="title_copy_to">Copy to &#8230;</string>
     <string name="title_subscribe">Subscribe</string>