From 59ab6f42dbe16a0249a0f84fc518ebb514d7398c Mon Sep 17 00:00:00 2001
From: KyuubiRan <KyuubiRan@qq.com>
Date: Sun, 31 Oct 2021 13:25:09 +0800
Subject: [PATCH] Optimize code

---
 app/src/main/java/me/kyuubiran/qqcleaner/HookEntry.kt    | 2 +-
 app/src/main/java/me/kyuubiran/qqcleaner/HookLoader.kt   | 2 +-
 .../main/java/me/kyuubiran/qqcleaner/WeChatHookLoader.kt | 9 ++++-----
 .../main/java/me/kyuubiran/qqcleaner/utils/HookUtil.kt   | 6 +++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/me/kyuubiran/qqcleaner/HookEntry.kt b/app/src/main/java/me/kyuubiran/qqcleaner/HookEntry.kt
index 6ba8033..eb638d1 100644
--- a/app/src/main/java/me/kyuubiran/qqcleaner/HookEntry.kt
+++ b/app/src/main/java/me/kyuubiran/qqcleaner/HookEntry.kt
@@ -19,7 +19,7 @@ class HookEntry : IXposedHookLoadPackage, IXposedHookZygoteInit {
             "com.tencent.mm" -> {
                 EzXHelperInit.initHandleLoadPackage(lpparam)
                 EzXHelperInit.setLogTag("QQCleaner")
-                WeChatHookLoader(lpparam)
+                WeChatHookLoader()
             }
         }
     }
diff --git a/app/src/main/java/me/kyuubiran/qqcleaner/HookLoader.kt b/app/src/main/java/me/kyuubiran/qqcleaner/HookLoader.kt
index 2035fc3..ff8afd9 100644
--- a/app/src/main/java/me/kyuubiran/qqcleaner/HookLoader.kt
+++ b/app/src/main/java/me/kyuubiran/qqcleaner/HookLoader.kt
@@ -65,7 +65,7 @@ class HookLoader(lpparam: XC_LoadPackage.LoadPackageParam) {
                         initItem()
                         secondInitQQ = true
                     } catch (thr: Throwable) {
-                        Log.t(thr)
+                        Log.e(thr)
                         throw thr
                     }
                 }
diff --git a/app/src/main/java/me/kyuubiran/qqcleaner/WeChatHookLoader.kt b/app/src/main/java/me/kyuubiran/qqcleaner/WeChatHookLoader.kt
index a372c2f..ccb5916 100644
--- a/app/src/main/java/me/kyuubiran/qqcleaner/WeChatHookLoader.kt
+++ b/app/src/main/java/me/kyuubiran/qqcleaner/WeChatHookLoader.kt
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.app.Application
 import com.github.kyuubiran.ezxhelper.init.EzXHelperInit
 import com.github.kyuubiran.ezxhelper.utils.Log
-import de.robv.android.xposed.callbacks.XC_LoadPackage
 import me.kyuubiran.qqcleaner.data.hostInfo
 import me.kyuubiran.qqcleaner.data.init
 import me.kyuubiran.qqcleaner.hook.ModuleEntryHook
@@ -16,9 +15,9 @@ private var firstInit = false
 var secondInitWeChat = false
     private set
 
-class WeChatHookLoader(lpparam: XC_LoadPackage.LoadPackageParam) {
+class WeChatHookLoader {
     init {
-        doInit(lpparam.classLoader)
+        doInit()
     }
 
     private fun initItem() {
@@ -28,7 +27,7 @@ class WeChatHookLoader(lpparam: XC_LoadPackage.LoadPackageParam) {
     }
 
     @SuppressLint("DiscouragedPrivateApi")
-    private fun doInit(rtLoader: ClassLoader) {
+    private fun doInit() {
         if (firstInit) return
         try {
             Application::class.java.getDeclaredMethod("onCreate")
@@ -51,7 +50,7 @@ class WeChatHookLoader(lpparam: XC_LoadPackage.LoadPackageParam) {
             firstInit = true
         } catch (thr: Throwable) {
             if (thr.toString().contains("com.google.android.webview")) return
-            Log.t(thr)
+            Log.e(thr)
             throw thr
         }
     }
diff --git a/app/src/main/java/me/kyuubiran/qqcleaner/utils/HookUtil.kt b/app/src/main/java/me/kyuubiran/qqcleaner/utils/HookUtil.kt
index 470d7b7..c707baf 100644
--- a/app/src/main/java/me/kyuubiran/qqcleaner/utils/HookUtil.kt
+++ b/app/src/main/java/me/kyuubiran/qqcleaner/utils/HookUtil.kt
@@ -11,7 +11,7 @@ object HookUtil {
     internal fun Member.hook(callback: XC_MethodHook) = try {
         XposedBridge.hookMethod(this, callback)
     } catch (thr: Throwable) {
-        Log.t(thr)
+        Log.e(thr)
         null
     }
 
@@ -21,7 +21,7 @@ object HookUtil {
                 override fun beforeHookedMethod(param: MethodHookParam?) = try {
                     hooker(param!!)
                 } catch (thr: Throwable) {
-                    Log.t(thr)
+                    Log.e(thr)
                 }
             })
 
@@ -30,7 +30,7 @@ object HookUtil {
             override fun afterHookedMethod(param: MethodHookParam?) = try {
                 hooker(param!!)
             } catch (thr: Throwable) {
-                Log.t(thr)
+                Log.e(thr)
             }
         })