From 56e91abde1f4c87681f7db8a23e9b6ccea367afd Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 18 Sep 2020 12:02:05 +0200
Subject: [PATCH] Fixed flickering on vertical overscroll

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 4 ++--
 app/src/main/java/eu/faircode/email/WebViewEx.java      | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index a1f1f19cee..c62760b501 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1929,7 +1929,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                             @Override
                             public void onOverScrolled(int scrollX, int scrollY, int dx, int dy, boolean clampedX, boolean clampedY) {
-                                if (clampedY && ((WebViewEx) wvBody).isZoomed())
+                                if (clampedY && ((WebViewEx) wvBody).isZoomedY())
                                     properties.scrollBy(0, dy);
                             }
 
@@ -2796,7 +2796,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             } else {
                 //view.getParent().requestDisallowInterceptTouchEvent(false);
                 //return (view.getId() == R.id.wvBody && ev.getAction() == MotionEvent.ACTION_MOVE);
-                boolean intercept = (view.getId() == R.id.wvBody && ((WebViewEx) wvBody).isZoomed());
+                boolean intercept = (view.getId() == R.id.wvBody && ((WebViewEx) wvBody).isZoomedY());
                 view.getParent().requestDisallowInterceptTouchEvent(intercept);
                 return false;
             }
diff --git a/app/src/main/java/eu/faircode/email/WebViewEx.java b/app/src/main/java/eu/faircode/email/WebViewEx.java
index 52039725af..c9c6769914 100644
--- a/app/src/main/java/eu/faircode/email/WebViewEx.java
+++ b/app/src/main/java/eu/faircode/email/WebViewEx.java
@@ -191,7 +191,7 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
             clampedY = true;
         }
 
-        Log.i("MMM clamped=" + clampedY + " new=" + newScrollY + " dy=" + deltaY + " mode=" + overScrollMode);
+        Log.i("onOverScrolled clamped=" + clampedY + " new=" + newScrollY + " dy=" + deltaY);
         intf.onOverScrolled(scrollX, scrollY, deltaX, deltaY, clampedX, clampedY);
 
         return super.overScrollBy(deltaX, deltaY, scrollX, scrollY, scrollRangeX, scrollRangeY, maxOverScrollX, maxOverScrollY, isTouchEvent);
@@ -235,7 +235,7 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
         return super.onGenericMotionEvent(event);
     }
 
-    public boolean isZoomed() {
+    public boolean isZoomedX() {
         int xtend = computeHorizontalScrollExtent();
         if (xtend != 0) {
             float xscale = computeHorizontalScrollRange() / (float) xtend;
@@ -243,6 +243,10 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
                 return true;
         }
 
+        return false;
+    }
+
+    public boolean isZoomedY() {
         int ytend = computeVerticalScrollExtent();
         if (ytend != 0) {
             float yscale = computeVerticalScrollRange() / (float) ytend;