From 4fb5c00f97cfcb1f1bc6b896f36be72e8f736e6a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 8 Jul 2020 09:34:13 +0200
Subject: [PATCH] Expand only on enter

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index ad4c7515e2..8ceb770b65 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2953,10 +2953,16 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         public boolean onKeyPressed(KeyEvent event) {
             TupleMessageEx message = getMessage();
+            if (message == null)
+                return false;
+
             switch (event.getKeyCode()) {
                 case KeyEvent.KEYCODE_ENTER:
                 case KeyEvent.KEYCODE_DPAD_CENTER:
                 case KeyEvent.KEYCODE_BUTTON_A:
+                    boolean expanded = properties.getValue("expanded", message.id);
+                    if (expanded)
+                        return false;
                     onClick(view);
                     return true;
                 case KeyEvent.KEYCODE_A:
@@ -2966,7 +2972,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     onActionTrash(message, false);
                     return false;
                 case KeyEvent.KEYCODE_S:
-                    if (message == null || selectionTracker == null)
+                    if (selectionTracker == null)
                         return false;
                     if (selectionTracker.isSelected(message.id))
                         selectionTracker.deselect(message.id);