From 2680a2d64f444d25a8f0e166a0b44102f62a9ed2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 27 Apr 2019 14:34:52 +0200
Subject: [PATCH] Prevent flicker

---
 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 25794d12ab..cab5daa57a 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1399,7 +1399,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     @Override
                     public boolean onTouchEvent(MotionEvent event) {
-                        getParent().requestDisallowInterceptTouchEvent(true);
+                        if (event.getPointerCount() == 2)
+                            getParent().requestDisallowInterceptTouchEvent(true); // zoom
+                        else if (event.getAction() == MotionEvent.ACTION_MOVE) {
+                            int range = computeVerticalScrollRange() - computeVerticalScrollExtent();
+                            if (range > 0) // scroll
+                                getParent().requestDisallowInterceptTouchEvent(true);
+                        }
                         return super.onTouchEvent(event);
                     }