fix: skip startRecentsAnimationPre

parallelcc · Dec 14, 2024 · ecbef7b · ecbef7b
1 parent 2e74254
commit ecbef7b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 30 deletions.
diff --git a/app/src/main/java/com/parallelc/micts/ModuleMain.kt b/app/src/main/java/com/parallelc/micts/ModuleMain.kt
@@ -65,16 +65,15 @@ class ModuleMain(base: XposedInterface, param: ModuleLoadedParam) : XposedModule
 
         when (param.packageName) {
             "com.miui.home", "com.mi.android.globallauncher" -> {
-                runCatching {
+                val skipHookTouch = runCatching {
                     val circleToSearchHelper = param.classLoader.loadClass("com.miui.home.recents.cts.CircleToSearchHelper")
                     hook(circleToSearchHelper.getDeclaredMethod("invokeOmni", Context::class.java, Int::class.java, Int::class.java), InvokeOmniHooker::class.java)
-                    return
                 }.onFailure { e ->
                     log("hook CircleToSearchHelper fail", e)
-                }
+                }.isSuccess
 
                 runCatching {
-                    NavStubViewHooker.hook(param)
+                    NavStubViewHooker.hook(param, skipHookTouch)
                 }.onFailure { e ->
                     log("hook NavStubView fail", e)
                 }

diff --git a/app/src/main/java/com/parallelc/micts/hooker/CSMSHooker.kt b/app/src/main/java/com/parallelc/micts/hooker/CSMSHooker.kt
@@ -34,7 +34,7 @@ class CSMSHooker {
         fun startContextualSearch(entryPoint: Int): Boolean {
             var unhookers = mutableListOf<MethodUnhooker<Method>>()
             return runCatching {
-                unhookers += module!!.hook(enforcePermission!!, EnforcePermissionHooker::class.java)
+                unhookers += module!!.hook(enforcePermission!!, SkipHooker::class.java)
                 unhookers += module!!.hook(getContextualSearchPackageName!!, GetCSPackageNameHooker::class.java)
 
                 val icsmClass = Class.forName("android.app.contextualsearch.IContextualSearchManager")
@@ -61,17 +61,6 @@ class CSMSHooker {
             }
         }
 
-        @XposedHooker
-        class EnforcePermissionHooker : Hooker {
-            companion object {
-                @JvmStatic
-                @BeforeInvocation
-                fun before(callback: BeforeHookCallback) {
-                    callback.returnAndSkip(null)
-                }
-            }
-        }
-
         @XposedHooker
         class GetCSPackageNameHooker : Hooker {
             companion object {

diff --git a/app/src/main/java/com/parallelc/micts/hooker/NavStubViewHooker.kt b/app/src/main/java/com/parallelc/micts/hooker/NavStubViewHooker.kt
@@ -24,23 +24,25 @@ class NavStubViewHooker {
         private lateinit var mCurrY: Field
         private lateinit var mInitY: Field
 
-        fun hook(param: PackageLoadedParam) {
+        fun hook(param: PackageLoadedParam, skipHookTouch: Boolean) {
             val navStubView = param.classLoader.loadClass("com.miui.home.recents.NavStubView")
+            runCatching {
+                module!!.hook(navStubView.getDeclaredMethod("startRecentsAnimationPre"), SkipHooker::class.java)
+            }
+            if (skipHookTouch) return
             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)
-                }
+            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)
         }
 
         @XposedHooker

diff --git a/app/src/main/java/com/parallelc/micts/hooker/SkipHooker.kt b/app/src/main/java/com/parallelc/micts/hooker/SkipHooker.kt
@@ -0,0 +1,17 @@
+package com.parallelc.micts.hooker
+
+import io.github.libxposed.api.XposedInterface.BeforeHookCallback
+import io.github.libxposed.api.XposedInterface.Hooker
+import io.github.libxposed.api.annotations.BeforeInvocation
+import io.github.libxposed.api.annotations.XposedHooker
+
+@XposedHooker
+class SkipHooker : Hooker {
+    companion object {
+        @JvmStatic
+        @BeforeInvocation
+        fun before(callback: BeforeHookCallback) {
+            callback.returnAndSkip(null)
+        }
+    }
+}