From 5050a8f0a8ee1d29b017f00d7c95846c56a74cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvagner@pvagner.tk>
Date: Sat, 28 Dec 2019 19:49:50 +0100
Subject: [PATCH] Add read receipt, plain text only and browsed for properties
 to the message item content description. These are all static images that
 should not be focusable so remove individual contentDescriptions from them
 too.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 9 +++++++++
 app/src/main/res/layout/include_message_addresses.xml   | 3 ---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 57127a0109..c8f4879f86 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3765,6 +3765,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 }
                 ibSnoozed.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
 
+                if (expanded) {
+                    if (message.receipt_request != null && message.receipt_request)
+                        result.add(context.getString(R.string.title_legend_receipt));
+                    if (message.plain_only != null && message.plain_only)
+                        result.add(context.getString(R.string.title_legend_plain_only));
+                    if (message.ui_browsed)
+                        result.add(context.getString(R.string.title_legend_browsed));
+                }
+
                 if (tvFolder.getVisibility() == View.VISIBLE)
                     result.add(tvFolder.getText().toString());
                 if (tvSize.getVisibility() == View.VISIBLE)
diff --git a/app/src/main/res/layout/include_message_addresses.xml b/app/src/main/res/layout/include_message_addresses.xml
index df8c38d028..adea721f35 100644
--- a/app/src/main/res/layout/include_message_addresses.xml
+++ b/app/src/main/res/layout/include_message_addresses.xml
@@ -18,7 +18,6 @@
         android:layout_width="21dp"
         android:layout_height="21dp"
         android:layout_marginStart="6dp"
-        android:contentDescription="@string/title_legend_plain_only"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
         app:srcCompat="@drawable/baseline_notes_24" />
@@ -28,7 +27,6 @@
         android:layout_width="21dp"
         android:layout_height="21dp"
         android:layout_marginStart="6dp"
-        android:contentDescription="@string/title_legend_receipt"
         app:layout_constraintStart_toEndOf="@id/ivPlain"
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
         app:srcCompat="@drawable/baseline_playlist_add_check_24" />
@@ -38,7 +36,6 @@
         android:layout_width="21dp"
         android:layout_height="21dp"
         android:layout_marginStart="6dp"
-        android:contentDescription="@string/title_legend_browsed"
         app:layout_constraintStart_toEndOf="@id/ivReceipt"
         app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
         app:srcCompat="@drawable/baseline_playlist_add_24" />