From 45ee805c8e411a053147013a39d5fcda6d4d8943 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 30 Apr 2019 08:03:20 +0200
Subject: [PATCH] Cleanup

---
 .../eu/faircode/email/FragmentMessages.java   | 26 ++-----------------
 .../java/eu/faircode/email/SwipeListener.java |  8 +++---
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index c3d3854ec9..0da2ef0edc 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -51,7 +51,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.webkit.WebView;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
 import android.widget.ImageButton;
@@ -1006,39 +1005,18 @@ public class FragmentMessages extends FragmentBase {
 
     private SwipeListener swipeListener = new SwipeListener(getContext(), new SwipeListener.ISwipeListener() {
         @Override
-        public boolean onSwipeRight(MotionEvent me) {
-            if (inWebView(me))
-                return false;
+        public boolean onSwipeRight() {
             if (previous != null)
                 navigate(previous, true);
             return (previous != null);
         }
 
         @Override
-        public boolean onSwipeLeft(MotionEvent me) {
-            if (inWebView(me))
-                return false;
+        public boolean onSwipeLeft() {
             if (next != null)
                 navigate(next, false);
             return (next != null);
         }
-
-        private boolean inWebView(MotionEvent me) {
-            View parent = rvMessage.findChildViewUnder(me.getX(), me.getY());
-            if (parent == null)
-                return false;
-
-            View child = parent.findViewById(R.id.vwBody);
-            if (!(child instanceof WebView))
-                return false;
-
-            int[] location = new int[2];
-            child.getLocationOnScreen(location);
-            int x = location[0];
-            int y = location[1];
-            return (me.getRawX() >= x && me.getRawX() <= x + view.getWidth() &&
-                    me.getRawY() >= y && me.getRawY() <= y + view.getHeight());
-        }
     });
 
     private void onActionMove(String folderType) {
diff --git a/app/src/main/java/eu/faircode/email/SwipeListener.java b/app/src/main/java/eu/faircode/email/SwipeListener.java
index f372bd0c73..f3b177709f 100644
--- a/app/src/main/java/eu/faircode/email/SwipeListener.java
+++ b/app/src/main/java/eu/faircode/email/SwipeListener.java
@@ -27,9 +27,9 @@ public class SwipeListener implements View.OnTouchListener {
                     if (Math.abs(dx) > MOVE_THRESHOLD && Math.abs(vx) > SPEED_THRESHOLD)
                         try {
                             if (dx > 0)
-                                consumed = listener.onSwipeRight(me1);
+                                consumed = listener.onSwipeRight();
                             else
-                                consumed = listener.onSwipeLeft(me1);
+                                consumed = listener.onSwipeLeft();
                         } catch (Throwable ex) {
                             Log.e(ex);
                         }
@@ -44,8 +44,8 @@ public class SwipeListener implements View.OnTouchListener {
     }
 
     interface ISwipeListener {
-        boolean onSwipeRight(MotionEvent me);
+        boolean onSwipeRight();
 
-        boolean onSwipeLeft(MotionEvent me);
+        boolean onSwipeLeft();
     }
 }
\ No newline at end of file