fix: 可能的空指针 & 设备判断失败 & 日志输出

HChenX · Dec 2, 2024 · 99edf3e · 99edf3e
1 parent b100537
commit 99edf3e
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 18 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,8 +3,8 @@ plugins {
     id 'maven-publish'
 }
 
-def defVersion = 'v.1.0.8'
-int defVersionCode = 2024112600
+def defVersion = 'v.1.0.9'
+int defVersionCode = 2024120100
 
 group = 'com.github.HChenX'
 version = defVersion

diff --git a/app/src/main/java/com/hchen/hooktool/BaseHC.java b/app/src/main/java/com/hchen/hooktool/BaseHC.java
@@ -42,8 +42,8 @@
 public abstract class BaseHC extends CoreTool {
     public String TAG = getClass().getSimpleName(); // 快捷获取类的简单名称作为 TAG, 为了效果建议配置相应的混淆规则。
     private final ChainTool mChainTool = new ChainTool();
-    public static XC_LoadPackage.LoadPackageParam lpparam = ToolData.mLpparam;
-    public static ClassLoader classLoader = ToolData.mClassLoader;
+    public static XC_LoadPackage.LoadPackageParam lpparam; // onZygote 状态下为 null。
+    public static ClassLoader classLoader;
 
     /**
      * 一般阶段。

diff --git a/app/src/main/java/com/hchen/hooktool/HCInit.java b/app/src/main/java/com/hchen/hooktool/HCInit.java
@@ -76,10 +76,11 @@ public static void initLoadPackageParam(XC_LoadPackage.LoadPackageParam loadPack
         }
         ToolData.isXposed = true;
         ToolData.mLpparam = loadPackageParam;
-        ClassLoader classLoader = loadPackageParam.classLoader;
-        ToolData.mClassLoader = classLoader;
+        ToolData.mClassLoader = loadPackageParam.classLoader;
+        BaseHC.lpparam = loadPackageParam;
+        BaseHC.classLoader = loadPackageParam.classLoader;
         String packageName = loadPackageParam.packageName;
-        logI("Init classloader: [" + classLoader + "], pkg: " + packageName);
+        logI("Init classloader: [" + loadPackageParam.classLoader + "], pkg: " + packageName);
     }
 
     /**
@@ -96,6 +97,7 @@ public static void initStartupParam(IXposedHookZygoteInit.StartupParam startupPa
         ToolData.isXposed = true;
         ToolData.mStartupParam = startupParam;
         ToolData.mClassLoader = startupParam.getClass().getClassLoader();
+        BaseHC.classLoader = startupParam.getClass().getClassLoader();
     }
 
     /**

diff --git a/app/src/main/java/com/hchen/hooktool/tool/ChainTool.java b/app/src/main/java/com/hchen/hooktool/tool/ChainTool.java
@@ -25,8 +25,8 @@
 import static com.hchen.hooktool.hook.HookFactory.createHook;
 import static com.hchen.hooktool.log.LogExpand.getStackTrace;
 import static com.hchen.hooktool.log.LogExpand.getTag;
-import static com.hchen.hooktool.log.XposedLog.logD;
 import static com.hchen.hooktool.log.XposedLog.logE;
+import static com.hchen.hooktool.log.XposedLog.logI;
 import static com.hchen.hooktool.log.XposedLog.logW;
 import static com.hchen.hooktool.tool.CoreTool.existsConstructor;
 import static com.hchen.hooktool.tool.CoreTool.existsMethod;
@@ -191,7 +191,7 @@ public void doChainHook() {
             for (ChainData memberData : chainData.members) {
                 try {
                     XposedBridge.hookMethod(memberData.member, createHook(getTag(), chainData.iHook));
-                    logD(getTag(), "Success to hook: " + memberData.member);
+                    logI(getTag(), "Success to hook: " + memberData.member);
                 } catch (Throwable e) {
                     logE(getTag(), "Failed to hook: " + memberData.member, e);
                 }

diff --git a/app/src/main/java/com/hchen/hooktool/tool/CoreBase.java b/app/src/main/java/com/hchen/hooktool/tool/CoreBase.java
@@ -24,8 +24,8 @@
 import static com.hchen.hooktool.hook.HookFactory.createHook;
 import static com.hchen.hooktool.log.LogExpand.getStackTrace;
 import static com.hchen.hooktool.log.LogExpand.getTag;
-import static com.hchen.hooktool.log.XposedLog.logD;
 import static com.hchen.hooktool.log.XposedLog.logE;
+import static com.hchen.hooktool.log.XposedLog.logI;
 import static com.hchen.hooktool.log.XposedLog.logW;
 import static com.hchen.hooktool.tool.CoreTool.findConstructor;
 import static com.hchen.hooktool.tool.CoreTool.findMethod;
@@ -52,7 +52,7 @@
  * @author 焕晨HChen
  * @noinspection unchecked
  */
-public final class CoreBase {
+final class CoreBase {
     private CoreBase() {
     }
 
@@ -136,7 +136,7 @@ static CoreTool.UnHook baseHook(MemberData<Class<?>> clazz, String method, Objec
 
         return run(() -> {
             CoreTool.UnHook unHook = new CoreTool.UnHook(XposedBridge.hookMethod(((MemberData<Member>) member).getNoReport(), createHook(tag, iHook)));
-            logD(tag, "Success to hook: " + member.getNoReport());
+            logI(tag, "Success to hook: " + member.getNoReport());
             return unHook;
         }).orErrMag(new CoreTool.UnHook(null), "Failed to hook! \ndebug: " + debug);
     }

diff --git a/app/src/main/java/com/hchen/hooktool/tool/CoreTool.java b/app/src/main/java/com/hchen/hooktool/tool/CoreTool.java
@@ -21,7 +21,6 @@
 import static com.hchen.hooktool.helper.TryHelper.run;
 import static com.hchen.hooktool.hook.HookFactory.createHook;
 import static com.hchen.hooktool.log.LogExpand.getTag;
-import static com.hchen.hooktool.log.XposedLog.logD;
 import static com.hchen.hooktool.log.XposedLog.logI;
 import static com.hchen.hooktool.log.XposedLog.logW;
 import static com.hchen.hooktool.tool.CoreBase.baseCallStaticMethod;
@@ -260,7 +259,7 @@ public static UnHook hook(Member member, IHook iHook) {
         String tag = getTag();
         return run(() -> {
             UnHook unhook = new UnHook(XposedBridge.hookMethod(member, createHook(tag, iHook)));
-            logD(tag, "Success to hook: " + member);
+            logI(tag, "Success to hook: " + member);
             return unhook;
         }).orErrMag(new UnHook(null), "Failed to hook: " + member);
     }
@@ -273,7 +272,7 @@ public static UnHookList hookAll(MemberListData<Member> members, IHook iHook) {
         }
         return members.stream().map(member -> run(() -> {
             UnHook unHook = new UnHook(XposedBridge.hookMethod(member, createHook(tag, iHook)));
-            logD(tag, "Success to hook: " + member);
+            logI(tag, "Success to hook: " + member);
             return unHook;
         }).orErrMag(new UnHook(null), "Failed to hook: " + member)).collect(Collectors.toCollection(UnHookList::new));
     }

diff --git a/app/src/main/java/com/hchen/hooktool/tool/additional/DeviceTool.java b/app/src/main/java/com/hchen/hooktool/tool/additional/DeviceTool.java
@@ -222,7 +222,8 @@ public static boolean isMagicOs() {
     public static boolean isRightRom(final String... names) {
         if (names == null) return false;
         for (String name : names) {
-            if (Build.BRAND.toLowerCase().contains(name) || Build.MANUFACTURER.toLowerCase().contains(name)) {
+            if (Build.BRAND.toLowerCase().contains(name.toLowerCase())
+                    || Build.MANUFACTURER.toLowerCase().contains(name.toLowerCase())) {
                 return true;
             }
         }