Revert "Prevent long press from leaking into header gesture detector"

This reverts commit 935114fc4c.

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -389,8 +389,6 @@ public class FragmentMessages extends FragmentBase
     private boolean scrolling = false;
     private boolean navigating = false;
 
-    private GestureDetector gestureDetector;
-
     private AdapterMessage adapter;
 
     private AdapterMessage.ViewType viewType;
@@ -1198,12 +1196,15 @@ public class FragmentMessages extends FragmentBase
         };
         rvMessage.addItemDecoration(dateDecorator);
 
-        gestureDetector =
+        rvMessage.addOnItemTouchListener(new RecyclerView.OnItemTouchListener() {
+            private final GestureDetector gestureDetector =
                     new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() {
                         @Override
                         public void onLongPress(@NonNull MotionEvent e) {
                             if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
                                 return;
+                            if (swiping)
+                                return;
 
                             int x = Math.round(e.getX());
                             int y = Math.round(e.getY());
@@ -1256,7 +1257,6 @@ public class FragmentMessages extends FragmentBase
                         }
                     });
 
-        rvMessage.addOnItemTouchListener(new RecyclerView.OnItemTouchListener() {
             @Override
             public boolean onInterceptTouchEvent(@NonNull RecyclerView rv, @NonNull MotionEvent e) {
                 gestureDetector.onTouchEvent(e);
@@ -3282,7 +3282,6 @@ public class FragmentMessages extends FragmentBase
             @Override
             public void run() {
                 swiping = false;
-                gestureDetector.setIsLongpressEnabled(true);
                 Log.i("Swiping ended");
             }
         };
@@ -3293,7 +3292,6 @@ public class FragmentMessages extends FragmentBase
             getMainHandler().removeCallbacks(disableSwiping);
             if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
                 swiping = true;
-                gestureDetector.setIsLongpressEnabled(false);
                 Log.i("Swiping started");
             } else
                 getMainHandler().postDelayed(disableSwiping, ViewConfiguration.getLongPressTimeout() + 100);