checker-pine

simplepeng · Jun 18, 2022 · e1889af · e1889af
1 parent 07741b5
commit e1889af
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/checker-pine/src/main/java/me/simple/checker/CheckerHelper.java b/checker-pine/src/main/java/me/simple/checker/CheckerHelper.java
@@ -30,12 +30,10 @@ public static Context getAppContext(Context context) {
     }
 
     public static void showWarn(String text) {
-        StringBuilder builder = new StringBuilder();
-        builder.append("Warning!!!").append("\n\n");
-        builder.append("非法使用了不合规的方法： ").append("\n\n");
-        builder.append(text);
-        toast(builder.toString());
         log(text);
+
+        String builder = "Warning!!!" + " ---> " + text;
+        toast(builder);
     }
 
     static void toast(String text) {

diff --git a/checker-pine/src/main/java/me/simple/checker/hookers/NetWorkHooker.java b/checker-pine/src/main/java/me/simple/checker/hookers/NetWorkHooker.java
@@ -1,7 +1,6 @@
 package me.simple.checker.hookers;
 
 import java.net.NetworkInterface;
-
 import me.simple.checker.CheckerHelper;
 import top.canyie.pine.Pine;
 import top.canyie.pine.callback.MethodHook;

diff --git a/checker-pine/src/main/java/me/simple/checker/hookers/SecureHooker.java b/checker-pine/src/main/java/me/simple/checker/hookers/SecureHooker.java
@@ -11,17 +11,17 @@
 public class SecureHooker {
 
     public static void hook() throws NoSuchMethodException {
-        hookAndroidId();
+        hookGetAndroidId();
     }
 
-    private static void hookAndroidId() throws NoSuchMethodException {
+    private static void hookGetAndroidId() throws NoSuchMethodException {
         Pine.hook(Settings.Secure.class.getDeclaredMethod("getString", ContentResolver.class, String.class), new MethodHook() {
             @Override
             public void beforeCall(Pine.CallFrame callFrame) throws Throwable {
                 super.beforeCall(callFrame);
                 try {
                     if (TextUtils.equals(Settings.Secure.ANDROID_ID, (String) callFrame.args[1])) {
-                        CheckerHelper.showWarn("AndroidId");
+                        CheckerHelper.showWarn("getAndroidId");
                     }
                 } catch (Throwable throwable) {
                     throwable.printStackTrace();

diff --git a/checker-pine/src/main/java/me/simple/checker/hookers/TelephonyHooker.java b/checker-pine/src/main/java/me/simple/checker/hookers/TelephonyHooker.java
@@ -12,8 +12,10 @@ public class TelephonyHooker {
     public static void hook() throws NoSuchMethodException {
         hookGetDeviceId();
         hookGetDeviceIdWithInt();
+
         hookGetImei();
         hookGetImeiWithInt();
+
         hookGetSubscriberId();
         hookGetSubscriberIdWithInt();
     }

diff --git a/checker/src/main/java/me/simple/checker/CheckerHelper.java b/checker/src/main/java/me/simple/checker/CheckerHelper.java
@@ -30,12 +30,13 @@ public static Context getAppContext(Context context) {
     }
 
     public static void showWarn(String text) {
+        log(text);
+
         StringBuilder builder = new StringBuilder();
-        builder.append("Warning!!!").append("\n\n");
-        builder.append("非法使用了不合规的方法： ").append("\n\n");
+        builder.append("Warning!!!");
+        builder.append("非法使用了不合规的方法： ");
         builder.append(text);
         toast(builder.toString());
-        log(text);
     }
 
     static void toast(String text) {