From fe9481b28d9b7c936e1fa23ea05153e52f617084 Mon Sep 17 00:00:00 2001
From: Cristian Luis Duarte <cristian.duarte.mb@gmail.com>
Date: Wed, 28 Mar 2018 19:50:44 -0300
Subject: [PATCH] Cleanup code, comment out log, simplify radar is valid touch
 code (no more flag)

---
 libraries/qml/src/qml/OffscreenSurface.cpp | 11 ++---
 scripts/system/+android/radar.js           | 51 +---------------------
 2 files changed, 6 insertions(+), 56 deletions(-)

diff --git a/libraries/qml/src/qml/OffscreenSurface.cpp b/libraries/qml/src/qml/OffscreenSurface.cpp
index ff36589b61..9c1bb79355 100644
--- a/libraries/qml/src/qml/OffscreenSurface.cpp
+++ b/libraries/qml/src/qml/OffscreenSurface.cpp
@@ -167,31 +167,28 @@ bool OffscreenSurface::eventFilter(QObject* originalDestination, QEvent* event)
         case QEvent::TouchEnd: {
             QTouchEvent *originalEvent = static_cast<QTouchEvent *>(event);
             QEvent::Type fakeMouseEventType = QEvent::None;
-            Qt::MouseButton fakeMouseButton = Qt::NoButton;
+            Qt::MouseButton fakeMouseButton = Qt::LeftButton;
             Qt::MouseButtons fakeMouseButtons = Qt::NoButton;
             switch (event->type()) {
                 case QEvent::TouchBegin:
                     fakeMouseEventType = QEvent::MouseButtonPress;
-                    fakeMouseButton = Qt::LeftButton;
                     fakeMouseButtons = Qt::LeftButton;
                     break;
                 case QEvent::TouchUpdate:
                     fakeMouseEventType = QEvent::MouseMove;
-                    fakeMouseButton = Qt::LeftButton;
                     fakeMouseButtons = Qt::LeftButton;
                     break;
                 case QEvent::TouchEnd:
                     fakeMouseEventType = QEvent::MouseButtonRelease;
-                    fakeMouseButton = Qt::LeftButton;
                     fakeMouseButtons = Qt::NoButton;
                     break;
             }
-            if (fakeMouseEventType == QEvent::None) break;
+            // Same case as OffscreenUi.cpp::eventFilter: touch events are always being accepted so we now use mouse events and consider one touch, touchPoints()[0].
             QMouseEvent fakeMouseEvent(fakeMouseEventType, originalEvent->touchPoints()[0].pos(), fakeMouseButton, fakeMouseButtons, Qt::NoModifier);
             fakeMouseEvent.ignore();
             if (QCoreApplication::sendEvent(_sharedObject->getWindow(), &fakeMouseEvent)) {
-                qInfo() << __FUNCTION__ << "sent fake touch event:" << fakeMouseEvent.type()
-                        << "_quickWindow handled it... accepted:" << fakeMouseEvent.isAccepted();
+                /*qInfo() << __FUNCTION__ << "sent fake touch event:" << fakeMouseEvent.type()
+                        << "_quickWindow handled it... accepted:" << fakeMouseEvent.isAccepted();*/
                 return fakeMouseEvent.isAccepted();
             }
             break;
diff --git a/scripts/system/+android/radar.js b/scripts/system/+android/radar.js
index 2bcdc60db7..455299dd5f 100644
--- a/scripts/system/+android/radar.js
+++ b/scripts/system/+android/radar.js
@@ -118,19 +118,10 @@ function actionOnObjectFromEvent(event) {
 }
 
 function mousePress(event) {
-    if (!isTouchValid(coords)) {
-        currentTouchIsValid = false;
-        return;
-    } else {
-        currentTouchIsValid = true;
-    }
     mousePressOrTouchEnd(event);
 }
 
 function mousePressOrTouchEnd(event) {
-    if (!currentTouchIsValid) {
-        return;
-    }
     if (radar) {
         if (actionOnObjectFromEvent(event)) {
             return;
@@ -155,9 +146,6 @@ function fakeDoubleTap(event) {
     teleporter.dragTeleportRelease(event);
 }
 
-var currentTouchIsValid = false; // Currently used to know if touch hasn't
-                                    // started on a UI overlay
-
 var DOUBLE_TAP_TIME = 300;
 var fakeDoubleTapStart = Date.now();
 var touchEndCount = 0;
@@ -238,12 +226,6 @@ function touchEnd(event) {
         return;
     }
 
-    // if touch is invalid, cancel
-    if (!currentTouchIsValid) {
-        printd("touchEnd fail because !currentTouchIsValid");
-        return;
-    }
-
     if (analyzeDoubleTap(event))
         return; // double tap detected, finish
 
@@ -345,20 +327,6 @@ function computePointAtPlaneY(x, y, py) {
             p2.z, py);
 }
 
-/*******************************************************************************
- * 
- ******************************************************************************/
-
-function isTouchValid(coords) {
-    // TODO: Extend to the detection of touches on new menu bars
-    var radarModeTouchValid = radarModeInterface.isTouchValid(coords);
-
-    // getItemAtPoint does not exist anymore, look for another way to know if we
-    // are touching buttons
-    // is it still needed?
-    return /* !tablet.getItemAtPoint(coords) && */radarModeTouchValid;
-}
-
 /*******************************************************************************
  * 
  ******************************************************************************/
@@ -373,16 +341,8 @@ function touchBegin(event) {
         x : event.x,
         y : event.y
     };
-    if (!isTouchValid(coords)) {
-        printd("analyze touch - RADAR_TOUCH - INVALID");
-        currentTouchIsValid = false;
-        touchStartingCoordinates = null;
-    } else {
-        printd("analyze touch - RADAR_TOUCH - ok");
-        currentTouchIsValid = true;
-        touchStartingCoordinates = coords;
-        touchBeginTime = Date.now();
-    }
+    touchStartingCoordinates = coords;
+    touchBeginTime = Date.now();
 }
 
 var startedDraggingCamera = false; // first time
@@ -848,9 +808,6 @@ function oneFingerTouchUpdate(event) {
 }
 
 function touchUpdate(event) {
-    if (!currentTouchIsValid) {
-        return; // avoid moving and zooming when tap is over UI entities
-    }
     if (event.isPinching || event.isPinchOpening) {
         pinchUpdate(event);
     } else {
@@ -1390,10 +1347,6 @@ radarModeInterface.setUniqueColor = function(c) {
     uniqueColor = c;
 };
 
-radarModeInterface.isTouchValid = function(coords) {
-    return true; // by default
-}
-
 module.exports = radarModeInterface;
 
 function updateRadar() {