From ba4a76dc18dcb97c091a23fd3f0f585801cd8f9d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 29 Apr 2019 16:10:26 +0200
Subject: [PATCH] Attempt to fix flickering

---
 .../main/java/eu/faircode/email/AdapterMessage.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 4e2be672ca..d35c6fdfe2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1417,12 +1417,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     @Override
                     protected void onOverScrolled(int scrollX, int scrollY, boolean clampedX, boolean clampedY) {
-                        super.onOverScrolled(scrollX, scrollY, clampedX, clampedY);
-                        if (clampedY) {
-                            int range = computeVerticalScrollRange() - computeVerticalScrollExtent();
-                            if (range > 0) // This is to prevent flicker
-                                properties.scrollBy(0, dy);
-                        }
+                        int range = computeVerticalScrollRange() - computeVerticalScrollExtent();
+                        Log.i("Overscroll=" + scrollY + "/" + clampedY + " range=" + range + " dy=" + dy);
+                        if (clampedY && range > 0 && (scrollY == 0 || scrollY == range))
+                            properties.scrollBy(0, dy);
+                        else
+                            super.onOverScrolled(scrollX, scrollY, clampedX, clampedY);
                     }
                 };