From 5be2874179619efa58bb743cce57ef7458991e91 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 27 Aug 2023 15:34:46 +0200
Subject: [PATCH] Monitor WebView user interaction

---
 .../eu/faircode/email/AdapterMessage.java     | 10 ++++++
 .../java/eu/faircode/email/WebViewEx.java     | 34 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 6f44c3d040..60943368c5 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2893,6 +2893,16 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                                     Uri uri = Uri.parse(url);
                                     return ViewHolder.this.onOpenLink(uri, null, EntityFolder.JUNK.equals(message.folderType));
                                 }
+
+                                @Override
+                                public void onUserInterAction() {
+                                    try {
+                                        Log.i("WebView user interaction");
+                                        parentFragment.getActivity().onUserInteraction();
+                                    } catch (Throwable ex) {
+                                        Log.e(ex);
+                                    }
+                                }
                             });
                     webView.setImages(show_images, inline);
                     webView.setOnTouchListener(touchListener);
diff --git a/app/src/main/java/eu/faircode/email/WebViewEx.java b/app/src/main/java/eu/faircode/email/WebViewEx.java
index 260231deaf..226804dde5 100644
--- a/app/src/main/java/eu/faircode/email/WebViewEx.java
+++ b/app/src/main/java/eu/faircode/email/WebViewEx.java
@@ -29,6 +29,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.util.Pair;
 import android.view.InputDevice;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.webkit.DownloadListener;
@@ -353,6 +354,37 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
         return super.onTouchEvent(event);
     }
 
+    @Override
+    public boolean dispatchKeyEvent(KeyEvent event) {
+        intf.onUserInterAction();
+        return super.dispatchKeyEvent(event);
+    }
+
+    @Override
+    public boolean dispatchKeyShortcutEvent(KeyEvent event) {
+        intf.onUserInterAction();
+        return super.dispatchKeyShortcutEvent(event);
+    }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        if (ev.getAction() == MotionEvent.ACTION_DOWN)
+            intf.onUserInterAction();
+        return super.dispatchTouchEvent(ev);
+    }
+
+    @Override
+    public boolean dispatchTrackballEvent(MotionEvent event) {
+        intf.onUserInterAction();
+        return super.dispatchTrackballEvent(event);
+    }
+
+    @Override
+    public boolean dispatchGenericMotionEvent(MotionEvent event) {
+        intf.onUserInterAction();
+        return super.dispatchGenericMotionEvent(event);
+    }
+
     public static boolean isFeatureSupported(Context context, String feature) {
         if (WebViewFeature.ALGORITHMIC_DARKENING.equals(feature)) {
             if (BuildConfig.DEBUG) {
@@ -429,5 +461,7 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
         void onScrollChange(int dx, int dy, int scrollX, int scrollY);
 
         boolean onOpenLink(String url);
+
+        void onUserInterAction();
     }
 }