From 80e89d087fc2f75c3e406bffe5afba7cf044b9d5 Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Mon, 17 Jun 2024 01:22:15 +0800
Subject: [PATCH] refactor: make some change for dexkit

---
 .../java/com/fankes/tsbattery/hook/entity/QQTIMHooker.kt  | 8 ++++----
 .../java/com/fankes/tsbattery/hook/helper/DexKitHelper.kt | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/fankes/tsbattery/hook/entity/QQTIMHooker.kt b/app/src/main/java/com/fankes/tsbattery/hook/entity/QQTIMHooker.kt
index e29b251..f24afb3 100644
--- a/app/src/main/java/com/fankes/tsbattery/hook/entity/QQTIMHooker.kt
+++ b/app/src/main/java/com/fankes/tsbattery/hook/entity/QQTIMHooker.kt
@@ -171,7 +171,7 @@ object QQTIMHooker : YukiBaseHooker() {
                             paramCount = 0
                             returnType = UnitType.name
                         }
-                    }.firstOrNull()?.getMethodInstance(classLoader)
+                    }.singleOrNull()?.getMethodInstance(classLoader)
                 DexKitData.BaseChatPie_CancelRemainScreenOnMethod =
                     findMethod {
                         matcher {
@@ -180,7 +180,7 @@ object QQTIMHooker : YukiBaseHooker() {
                             paramCount = 0
                             returnType = UnitType.name
                         }
-                    }.firstOrNull()?.getMethodInstance(classLoader)
+                    }.singleOrNull()?.getMethodInstance(classLoader)
             }
             val kotlinFunction0 = "kotlin.jvm.functions.Function0"
             findClass {
@@ -198,7 +198,7 @@ object QQTIMHooker : YukiBaseHooker() {
                     }
                     fields { count(6..Int.MAX_VALUE) }
                 }
-            }.firstOrNull()?.name?.also { className ->
+            }.singleOrNull()?.name?.also { className ->
                 DexKitData.SimpleItemProcessorClass = className.toClass()
                 DexKitData.SimpleItemProcessorClass_OnClickMethod =
                     findMethod {
@@ -208,7 +208,7 @@ object QQTIMHooker : YukiBaseHooker() {
                             returnType = UnitType.name
                             usingNumbers(2)
                         }
-                    }.firstOrNull()?.getMethodInstance(classLoader)
+                    }.singleOrNull()?.getMethodInstance(classLoader)
             }
         }
     }
diff --git a/app/src/main/java/com/fankes/tsbattery/hook/helper/DexKitHelper.kt b/app/src/main/java/com/fankes/tsbattery/hook/helper/DexKitHelper.kt
index 6f017d4..5867bf3 100644
--- a/app/src/main/java/com/fankes/tsbattery/hook/helper/DexKitHelper.kt
+++ b/app/src/main/java/com/fankes/tsbattery/hook/helper/DexKitHelper.kt
@@ -51,6 +51,6 @@ object DexKitHelper {
      */
     fun create(param: PackageParam, initiate: DexKitBridge.() -> Unit) {
         load()
-        runCatching { DexKitBridge.create(param.appInfo.sourceDir)?.use { initiate(it) } }
+        runCatching { DexKitBridge.create(param.appInfo.sourceDir).use { initiate(it) } }
     }
 }
\ No newline at end of file