From 16bf0db5fee106a320d726abbc67d01cbcdfa19a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 21 May 2026 07:52:35 +0200
Subject: [PATCH] Accessibility: trash conversation (2)

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

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 16eeb843c8..312f64ce71 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -8152,6 +8152,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibTrash,
                             context.getString(R.string.title_trash)));
 
+                    info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibTrashBottom,
+                            context.getString(R.string.title_trash_conversation)));
+
                     if (properties.getSelectionCount() > 0)
                         info.addAction(new AccessibilityNodeInfo.AccessibilityAction(R.id.ibDelete,
                                 context.getString(R.string.title_trash_selection)));
@@ -8225,6 +8228,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 } else if (action == R.id.ibTrash) {
                     onActionTrash(message, false);
                     return true;
+                } else if (action == R.id.ibTrashBottom) {
+                    properties.select(message.id, true);
+                    properties.moveSelection(EntityFolder.TRASH, false);
+                    return true;
                 } else if (action == R.id.ibDelete) {
                     properties.moveSelection(EntityFolder.TRASH, false);
                     return true;
@@ -9575,6 +9582,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         int getSelectionCount();
 
+        boolean select(long id, boolean unselect);
+
         void moveSelection(String type, boolean block);
 
         void reply(TupleMessageEx message, CharSequence selected, View anchor);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index bfb2fb3f59..833cad66d5 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2923,6 +2923,15 @@ public class FragmentMessages extends FragmentBase
             return getSelection().length;
         }
 
+        @Override
+        public boolean select(long id, boolean unselect) {
+            if (selectionTracker == null)
+                return false;
+            if (unselect)
+                selectionTracker.clearSelection();
+            return selectionTracker.select(id);
+        }
+
         @Override
         public void moveSelection(String type, boolean block) {
             onActionMoveSelection(type, block);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 58f453bce9..06903e8d6e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1635,6 +1635,7 @@
     <string name="title_quick_actions_clear">Clear selection after action</string>
 
     <string name="title_trash">Trash</string>
+    <string name="title_trash_conversation">Trash conversation</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>