From e8957591724c790ed0310b7290a8aefa9c1c6192 Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Wed, 30 Mar 2022 13:40:48 +0800
Subject: [PATCH] Fix allMethods hooking replace bug

---
 .../yukihookapi/demo_app/ui/MainActivity.kt   |  4 +++
 .../yukihookapi/demo_app/utils/Main.kt        | 10 +++++-
 .../src/main/res/layout/activity_main.xml     | 34 ++++++++++++++++++-
 .../yukihookapi/demo_module/hook/HookEntry.kt | 12 +++++++
 .../yukihookapi/hook/core/YukiHookCreater.kt  | 18 ++++++++--
 5 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/demo-app/src/main/java/com/highcapable/yukihookapi/demo_app/ui/MainActivity.kt b/demo-app/src/main/java/com/highcapable/yukihookapi/demo_app/ui/MainActivity.kt
index b95f3b07..9e826730 100644
--- a/demo-app/src/main/java/com/highcapable/yukihookapi/demo_app/ui/MainActivity.kt
+++ b/demo-app/src/main/java/com/highcapable/yukihookapi/demo_app/ui/MainActivity.kt
@@ -47,6 +47,10 @@ class MainActivity : AppCompatActivity() {
             appDemoFourthText.text = getRegularText(string = "Have fun day")
             appDemoFifthText.text = getDataText()
             appDemoSixthText.text = getArray(arrayOf("apple", "banana")).let { "${it[0]}, ${it[1]}" }
+            appDemoSeventhText.text = Main().getTestResultFirst()
+            appDemoEighthText.text = Main().getTestResultFirst(string = "Find something interesting")
+            appDemoNinthText.text = Main().getTestResultLast()
+            appDemoTenthText.text = Main().getTestResultLast(string = "This is the last sentence")
             appDemoButton.setOnClickListener { toast() }
         }
     }
diff --git a/demo-app/src/main/java/com/highcapable/yukihookapi/demo_app/utils/Main.kt b/demo-app/src/main/java/com/highcapable/yukihookapi/demo_app/utils/Main.kt
index bac0b7f5..056429b3 100644
--- a/demo-app/src/main/java/com/highcapable/yukihookapi/demo_app/utils/Main.kt
+++ b/demo-app/src/main/java/com/highcapable/yukihookapi/demo_app/utils/Main.kt
@@ -27,7 +27,15 @@
  */
 package com.highcapable.yukihookapi.demo_app.utils
 
-class Main(private val string: String) {
+class Main(private val string: String = "") {
 
     fun getString() = string
+
+    fun getTestResultFirst() = "The world is beautiful"
+
+    fun getTestResultFirst(string: String) = string
+
+    fun getTestResultLast() = "The world is fantastic"
+
+    fun getTestResultLast(string: String) = string
 }
\ No newline at end of file
diff --git a/demo-app/src/main/res/layout/activity_main.xml b/demo-app/src/main/res/layout/activity_main.xml
index 85183c0d..dba6a072 100644
--- a/demo-app/src/main/res/layout/activity_main.xml
+++ b/demo-app/src/main/res/layout/activity_main.xml
@@ -40,7 +40,31 @@
         android:textSize="20sp" />
 
     <TextView
-        android:id="@+id/app_demo_fifth_text"
+        android:id="@+id/app_demo_seventh_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
+        android:text="sample"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/app_demo_eighth_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
+        android:text="sample"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/app_demo_ninth_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
+        android:text="sample"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/app_demo_tenth_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="15dp"
@@ -55,6 +79,14 @@
         android:text="sample"
         android:textSize="20sp" />
 
+    <TextView
+        android:id="@+id/app_demo_fifth_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
+        android:text="sample"
+        android:textSize="20sp" />
+
     <Button
         android:id="@+id/app_demo_button"
         android:layout_width="wrap_content"
diff --git a/demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/hook/HookEntry.kt b/demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/hook/HookEntry.kt
index 2293de3a..d199db15 100644
--- a/demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/hook/HookEntry.kt
+++ b/demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/hook/HookEntry.kt
@@ -154,6 +154,18 @@ class HookEntry : YukiHookXposedInitProxy {
                             args().set("I am hook constructor param")
                         }
                     }
+                    // 注入要 Hook 的方法
+                    injectMember {
+                        allMethods(name = "getTestResultFirst")
+                        // 执行替换 Hook
+                        replaceTo("I am hook all methods first")
+                    }
+                    // 注入要 Hook 的方法
+                    injectMember {
+                        allMethods(name = "getTestResultLast")
+                        // 执行替换 Hook
+                        replaceTo("I am hook all methods last")
+                    }
                 }
             }
         }
diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/YukiHookCreater.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/YukiHookCreater.kt
index 8623ec0d..2a3d140a 100644
--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/YukiHookCreater.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/YukiHookCreater.kt
@@ -170,6 +170,10 @@ class YukiHookCreater(private val packageParam: PackageParam, private val hookCl
         /**
          * 查找并 Hook [hookClass] 中指定 [name] 的全部方法
          *
+         * 在同一个 [injectMember] 中
+         *
+         * 你只能使用一次 [allMethods]、[allConstructors]、[method]、[constructor] 方法 - 否则结果会被替换
+         *
          * - ❗警告：无法准确处理每个方法的返回值和 param - 建议使用 [method] 对每个方法单独 Hook
          *
          * - ❗如果 [hookClass] 中没有方法可能会发生错误
@@ -184,6 +188,10 @@ class YukiHookCreater(private val packageParam: PackageParam, private val hookCl
         /**
          * 查找并 Hook [hookClass] 中的全部构造方法
          *
+         * 在同一个 [injectMember] 中
+         *
+         * 你只能使用一次 [allMethods]、[allConstructors]、[method]、[constructor] 方法 - 否则结果会被替换
+         *
          * - ❗警告：无法准确处理每个构造方法的 param - 建议使用 [constructor] 对每个构造方法单独 Hook
          *
          * - ❗如果 [hookClass] 中没有构造方法可能会发生错误
@@ -197,7 +205,9 @@ class YukiHookCreater(private val packageParam: PackageParam, private val hookCl
         /**
          * 查找 [hookClass] 需要 Hook 的方法
          *
-         * 你只能使用一次 [method] 或 [constructor] 方法 - 否则结果会被替换
+         * 在同一个 [injectMember] 中
+         *
+         * 你只能使用一次 [allMethods]、[allConstructors]、[method]、[constructor] 方法 - 否则结果会被替换
          * @param initiate 方法体
          * @return [MethodFinder.Result]
          */
@@ -213,7 +223,9 @@ class YukiHookCreater(private val packageParam: PackageParam, private val hookCl
         /**
          * 查找 [hookClass] 需要 Hook 的构造方法
          *
-         * 你只能使用一次 [method] 或 [constructor] 方法 - 否则结果会被替换
+         * 在同一个 [injectMember] 中
+         *
+         * 你只能使用一次 [allMethods]、[allConstructors]、[method]、[constructor] 方法 - 否则结果会被替换
          * @param initiate 方法体
          * @return [ConstructorFinder.Result]
          */
@@ -493,7 +505,7 @@ class YukiHookCreater(private val packageParam: PackageParam, private val hookCl
          */
         internal val isNotIgnoredNoSuchMemberFailure get() = onNoSuchMemberFailureCallback == null && isNotIgnoredHookingFailure
 
-        override fun toString() = "${hookClass.name}$member$tag#YukiHookAPI"
+        override fun toString() = "${hookClass.name}$allMethodsName$member$hookAllMembers$tag#YukiHookAPI"
 
         /**
          * 监听 Hook 结果实现类