fix: mCheckLongPress removed due to action 2

Author: parallelcc

app/src/main/java/com/parallelc/micts/ModuleMain.kt

@@ -6,7 +6,6 @@ import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
 import android.os.SystemClock
-import android.view.MotionEvent
 import com.parallelc.micts.hooker.LongPressHomeHooker
 import com.parallelc.micts.hooker.NavStubViewHooker
 import com.parallelc.micts.hooker.ReturnFalseHooker
@@ -74,12 +73,7 @@ class ModuleMain(base: XposedInterface, param: ModuleLoadedParam) : XposedModule
         }
 
         runCatching {
-            val navStubView = param.classLoader.loadClass("com.miui.home.recents.NavStubView")
-            runCatching { navStubView.getDeclaredField("mCheckLongPress") }
-                .onSuccess { throw Exception("mCheckLongPress exists") }
-                .onFailure {
-                    hook(navStubView.getDeclaredMethod("onTouchEvent", MotionEvent::class.java), NavStubViewHooker::class.java)
-                }
+            NavStubViewHooker.hook(param)
         }.onFailure { e ->
             log("hook NavStubView fail", e)
         }

app/src/main/java/com/parallelc/micts/hooker/NavStubViewHooker.kt

@@ -1,38 +1,75 @@
 package com.parallelc.micts.hooker
 
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewConfiguration
 import com.parallelc.micts.module
 import com.parallelc.micts.triggerCircleToSearch
 import io.github.libxposed.api.XposedInterface.AfterHookCallback
 import io.github.libxposed.api.XposedInterface.Hooker
+import io.github.libxposed.api.XposedModuleInterface.PackageLoadedParam
 import io.github.libxposed.api.annotations.AfterInvocation
 import io.github.libxposed.api.annotations.XposedHooker
+import java.lang.reflect.Field
+import kotlin.math.abs
 
 @XposedHooker
-class NavStubViewHooker : Hooker {
+class NavStubViewHooker {
     companion object {
-        private val mCheckLongPress = Runnable {
-            runCatching {
-                triggerCircleToSearch()
-            }.onFailure { e ->
-                module.log("NavStubViewHooker mCheckLongPress fail", e)
-            }
+        private lateinit var mCurrAction: Field
+        private lateinit var mCurrX: Field
+        private lateinit var mInitX: Field
+        private lateinit var mCurrY: Field
+        private lateinit var mInitY: Field
+
+        fun hook(param: PackageLoadedParam) {
+            val navStubView = param.classLoader.loadClass("com.miui.home.recents.NavStubView")
+            runCatching { navStubView.getDeclaredField("mCheckLongPress") }
+                .onSuccess { throw Exception("mCheckLongPress exists") }
+                .onFailure {
+                    mCurrAction = navStubView.getDeclaredField("mCurrAction")
+                    mCurrAction.isAccessible = true
+                    mCurrX = navStubView.getDeclaredField("mCurrX")
+                    mCurrX.isAccessible = true
+                    mInitX = navStubView.getDeclaredField("mInitX")
+                    mInitX.isAccessible = true
+                    mCurrY = navStubView.getDeclaredField("mCurrY")
+                    mCurrY.isAccessible = true
+                    mInitY = navStubView.getDeclaredField("mInitY")
+                    mInitY.isAccessible = true
+                    module.hook(navStubView.getDeclaredMethod("onTouchEvent", MotionEvent::class.java), OnTouchEventHooker::class.java)
+                }
         }
 
-        @JvmStatic
-        @AfterInvocation
-        fun after(callback: AfterHookCallback) {
-            val view = callback.thisObject as View
-            view.removeCallbacks(this.mCheckLongPress)
-            runCatching {
-                val mCurrAction = callback.thisObject!!.javaClass.getDeclaredField("mCurrAction")
-                mCurrAction.isAccessible = true
-                if (mCurrAction.getInt(callback.thisObject) == 0) {
-                    view.postDelayed(this.mCheckLongPress, ViewConfiguration.getLongPressTimeout().toLong())
+        class OnTouchEventHooker : Hooker {
+            companion object {
+                private val mCheckLongPress = Runnable {
+                    runCatching {
+                        triggerCircleToSearch()
+                    }.onFailure { e ->
+                        module.log("NavStubViewHooker mCheckLongPress fail", e)
+                    }
+                }
+
+                @JvmStatic
+                @AfterInvocation
+                fun after(callback: AfterHookCallback) {
+                    runCatching {
+                        val view = callback.thisObject as View
+                        when(mCurrAction.getInt(callback.thisObject)) {
+                            0 -> view.postDelayed(mCheckLongPress, ViewConfiguration.getLongPressTimeout().toLong()) // DOWN
+                            2 -> { // HOLD
+                                if (abs(mCurrX.getFloat(callback.thisObject) - mInitX.getFloat(callback.thisObject)) > 4 ||
+                                    abs(mCurrY.getFloat(callback.thisObject) - mInitY.getFloat(callback.thisObject)) > 4)
+                                    view.removeCallbacks(mCheckLongPress)
+                                else {}
+                            }
+                            else -> view.removeCallbacks(mCheckLongPress)
+                        }
+                    }.onFailure { e ->
+                        module.log("NavStubViewHooker onTouchEvent fail", e)
+                    }
                 }
-            }.onFailure { e ->
-                module.log("NavStubViewHooker onTouchEvent fail", e)
             }
         }
     }

app/src/main/java/com/parallelc/micts/hooker/VIMSHooker.kt

@@ -18,8 +18,8 @@ import java.lang.reflect.Method
 
 class VIMSHooker {
     companion object {
-        private var contextualSearchKey: Int? = null
-        private var contextualSearchPackageName: Int? = null
+        private var contextualSearchKey: Int = 0
+        private var contextualSearchPackageName: Int = 0
 
         @SuppressLint("PrivateApi")
         fun hook(param: SystemServerLoadedParam) {
@@ -59,14 +59,12 @@ class VIMSHooker {
                 @JvmStatic
                 @BeforeInvocation
                 fun before(callback: BeforeHookCallback) {
-                    callback.args[0]?.let {
-                        when (it) {
-                            contextualSearchKey -> {
-                                callback.returnAndSkip("omni.entry_point")
-                            }
-                            contextualSearchPackageName -> {
-                                callback.returnAndSkip("com.google.android.googlequicksearchbox")
-                            }
+                    when (callback.args[0]) {
+                        contextualSearchKey -> {
+                            callback.returnAndSkip("omni.entry_point")
+                        }
+                        contextualSearchPackageName -> {
+                            callback.returnAndSkip("com.google.android.googlequicksearchbox")
                         }
                     }
                 }