From be9ca6beed75fb728c42a40d33dda3c38fae22e7 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 27 Dec 2019 11:58:24 +0100
Subject: [PATCH] Added accessibility message actions

---
 .../java/eu/faircode/email/AdapterMessage.java   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b743c7e9a7..ba048b34af 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3788,6 +3788,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                             context.getString(R.string.title_accessibility_view_help)));
                 ibHelp.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
 
+                if (expanded) {
+                    for (int i = 0; i < bnvActions.getMenu().size(); i++) {
+                        MenuItem menuItem = bnvActions.getMenu().getItem(i);
+                        if (menuItem.isVisible() && menuItem.isEnabled())
+                            info.addAction(new AccessibilityNodeInfo.AccessibilityAction(
+                                    menuItem.getItemId(), menuItem.getTitle()));
+                    }
+                }
+
                 info.setContentDescription(TextUtils.join(", ", result));
             }
 
@@ -3817,6 +3826,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         onHelp(message);
                         return true;
                     default:
+                        for (int i = 0; i < bnvActions.getMenu().size(); i++) {
+                            MenuItem menuItem = bnvActions.getMenu().getItem(i);
+                            if (menuItem.getItemId() == action) {
+                                bnvActions.getMenu().performIdentifierAction(action, 0);
+                                return true;
+                            }
+                        }
                         return super.performAccessibilityAction(host, action, args);
                 }
             }