From d4fe78781de01f3b776e3bddfdf691f398e078e8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 1 Jan 2022 14:57:56 +0100
Subject: [PATCH] Added fling fail-safe

---
 .../main/java/eu/faircode/email/AdapterMessage.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index d165b6182c..a581c202ae 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2427,8 +2427,17 @@ 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).isZoomedY())
-                                    rv.fling(dx * 10, dy * 10);
+                                if (clampedY && ((WebViewEx) wvBody).isZoomedY()) {
+                                    boolean flinged = false;
+                                    try {
+                                        if (rv != null)
+                                            flinged = rv.fling(dx * 10, dy * 10);
+                                    } catch (Throwable ex) {
+                                        Log.e(ex);
+                                    }
+                                    if (!flinged)
+                                        properties.scrollBy(dx, dy);
+                                }
                             }
 
                             @Override