Fixed random right click and mouse move

Author: darusc

client/app/src/main/java/com/example/mousedroid/GestureHandler.kt

@@ -12,11 +12,10 @@ class GestureHandler(context: Context): GestureDetector.SimpleOnGestureListener(
     private lateinit var view: View
 
     var scrolled = false
+    var lastScrolled: Long = 0
     var isLongPressed = false
     var isMovingAfterLongPress = false
 
-    var isScaling = false
-
     private val TAG = "Mousedroid"
 
     companion object {
@@ -54,16 +53,14 @@ class GestureHandler(context: Context): GestureDetector.SimpleOnGestureListener(
         distanceX: Float,
         distanceY: Float
     ): Boolean {
-        if(e1.pointerCount == 1 && e2.pointerCount == 1)
+        if(e1.pointerCount == 1 && e2.pointerCount == 1 && System.currentTimeMillis() - lastScrolled > 500)
             TcpClient.write(MOVE, distanceX, distanceY)
         else {
-            if(!isScaling) {
-                Log.d(TAG, "SCROLL")
-                TcpClient.write(SCROLL, -distanceY)
-                scrolled = true
-            }
+            TcpClient.write(SCROLL, -distanceY)
+            scrolled = true
+            lastScrolled = System.currentTimeMillis()
         }
 
         return super.onScroll(e1, e2, distanceX, distanceY)
     }
-}
+}

client/app/src/main/java/com/example/mousedroid/TouchpadFragment.kt

@@ -34,7 +34,7 @@ class TouchpadFragment(context: Context) : Fragment(), View.OnTouchListener {
 
     override fun onTouch(p0: View?, p1: MotionEvent): Boolean {
         if(p1.actionMasked == MotionEvent.ACTION_POINTER_UP && p1.pointerCount == 2){
-            if(!gestureHandler.scrolled){
+            if(!gestureHandler.scrolled && System.currentTimeMillis() - gestureHandler.lastScrolled > 500){
                 TcpClient.write(GestureHandler.RIGHT_CLICK)
             }
             else{
@@ -44,7 +44,7 @@ class TouchpadFragment(context: Context) : Fragment(), View.OnTouchListener {
         }
 
         if(gestureHandler.detector.onTouchEvent(p1)){
-             return true
+            return true
         }
 
         when(p1.action) {
@@ -68,4 +68,4 @@ class TouchpadFragment(context: Context) : Fragment(), View.OnTouchListener {
 
         return true
     }
-}
+}