From 16802dc25931b26f554c85ffe34e3dcb59a10b73 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 12 Jul 2018 17:28:09 +0200
Subject: [PATCH] Use overflow menu instead of long click in decrypt file list

Fixes #2370
---
 .../keychain/ui/DecryptListFragment.java               |  7 ++++---
 .../src/main/res/layout/decrypt_list_file_item.xml     | 10 ++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
index 52a198d53..69a3b25a1 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
@@ -1005,12 +1005,11 @@ public class DecryptListFragment
                 // save index closure-style :)
                 final int idx = i;
 
-                fileHolder.vFile.setOnLongClickListener(view -> {
+                fileHolder.vOverflowMenu.setVisibility(model.mResult.success() ? View.VISIBLE : View.GONE);
+                fileHolder.vOverflowMenu.setOnClickListener(view -> {
                     if (model.mResult.success()) {
                         displayBottomSheet(model.mResult, idx);
-                        return true;
                     }
-                    return false;
                 });
 
                 fileHolder.vFile.setOnClickListener(view -> {
@@ -1172,12 +1171,14 @@ public class DecryptListFragment
             public TextView vFilename;
             public TextView vFilesize;
             public ImageView vThumbnail;
+            public ImageView vOverflowMenu;
 
             public SubViewHolder(View itemView) {
                 vFile = itemView.findViewById(R.id.file);
                 vFilename = itemView.findViewById(R.id.filename);
                 vFilesize = itemView.findViewById(R.id.filesize);
                 vThumbnail = itemView.findViewById(R.id.thumbnail);
+                vOverflowMenu = itemView.findViewById(R.id.button_decryptfile_overflow);
             }
         }
 
diff --git a/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml b/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml
index f13a43fd6..4257eb47c 100644
--- a/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml
+++ b/OpenKeychain/src/main/res/layout/decrypt_list_file_item.xml
@@ -52,4 +52,14 @@
 
     </LinearLayout>
 
+    <ImageView
+        android:id="@+id/button_decryptfile_overflow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:src="@drawable/ic_more_vert_black_24dp"
+        android:padding="6dp"
+        android:background="?selectableItemBackground"
+        />
+
 </LinearLayout>
\ No newline at end of file