1.4.0.1 -> add detail log

Dr-TSNG · Apr 19, 2021 · d8b8535 · d8b8535
1 parent 746a10b
commit d8b8535
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,10 +12,8 @@ android {
         applicationId "com.tsng.hidemyapplist"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 14
-        versionName "1.4"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        versionCode 15
+        versionName "1.4.0.1"
     }
 
     buildTypes {

diff --git a/app/debug/output-metadata.json b/app/debug/output-metadata.json
@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.tsng.hidemyapplist",
+  "variantName": "processDebugResources",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 15,
+      "versionName": "1.4.0.1",
+      "outputFile": "app-debug.apk"
+    }
+  ]
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,9 @@
             android:enabled="true"
             android:exported="true" />
 
-        <activity android:name=".ui.SettingsActivity" />
+        <activity
+            android:name=".ui.SettingsActivity"
+            android:label="@string/title_settings" />
         <activity
             android:name=".ui.AboutActivity"
             android:theme="@style/AppTheme.About" />

diff --git a/app/src/main/java/com/tsng/hidemyapplist/JSONPreference.kt b/app/src/main/java/com/tsng/hidemyapplist/JSONPreference.kt
@@ -13,6 +13,7 @@ class JSONPreference {
     }
 
     var HookSelf = false
+    var DetailLog = false
     var Scope = mapOf<String, String>()
     var Templates = mutableMapOf<String, Template>()
 

diff --git a/app/src/main/java/com/tsng/hidemyapplist/ProvidePreferenceService.kt b/app/src/main/java/com/tsng/hidemyapplist/ProvidePreferenceService.kt
@@ -16,6 +16,7 @@ class ProvidePreferenceService : Service() {
             while (true) {
                 val json = JSONPreference()
                 json.HookSelf = getSharedPreferences("Settings", MODE_PRIVATE).getBoolean("HookSelf", false)
+                json.DetailLog = getSharedPreferences("Settings", MODE_PRIVATE).getBoolean("DetailLog", false)
                 json.Scope = getSharedPreferences("Scope", MODE_PRIVATE).all as Map<String, String>
                 for (template in getSharedPreferences("Templates", MODE_PRIVATE).getStringSet("List", setOf())) {
                     val obj = getSharedPreferences("tpl_$template", MODE_PRIVATE).all

diff --git a/app/src/main/java/com/tsng/hidemyapplist/xposed/XposedUtils.kt b/app/src/main/java/com/tsng/hidemyapplist/xposed/XposedUtils.kt
@@ -41,16 +41,19 @@ class XposedUtils {
             return field
         }
 
+        @JvmStatic
+        fun ld(log: String) {
+            XposedBridge.log("[HMA LOG] [DEBUG] $log")
+        }
+
         @JvmStatic
         fun li(log: String) {
             XposedBridge.log("[HMA LOG] [INFO] $log")
-            Log.i(LOG, log)
         }
 
         @JvmStatic
         fun le(log: String) {
             XposedBridge.log("[HMA LOG] [ERROR] $log")
-            Log.e(LOG, log)
         }
     }
 }
diff --git a/app/src/main/java/com/tsng/hidemyapplist/xposed/hooks/PackageManagerService.kt b/app/src/main/java/com/tsng/hidemyapplist/xposed/hooks/PackageManagerService.kt
@@ -9,6 +9,7 @@ import com.tsng.hidemyapplist.BuildConfig
 import com.tsng.hidemyapplist.JSONPreference
 import com.tsng.hidemyapplist.xposed.XposedUtils.Companion.APPNAME
 import com.tsng.hidemyapplist.xposed.XposedUtils.Companion.getRecursiveField
+import com.tsng.hidemyapplist.xposed.XposedUtils.Companion.ld
 import com.tsng.hidemyapplist.xposed.XposedUtils.Companion.li
 import de.robv.android.xposed.IXposedHookLoadPackage
 import de.robv.android.xposed.XC_MethodHook
@@ -75,10 +76,17 @@ class PackageManagerService : IXposedHookLoadPackage {
                         if (!isUseHook(callerName, hookName)) return
                         var isHidden = false
                         val iterator = (param.result as ParceledListSlice<*>).list.iterator()
-                        while (iterator.hasNext())
-                            if (isToHide(callerName, (getRecursiveField(iterator.next()!!, pkgNameObjList) as String?)))
-                                iterator.remove().also { isHidden = true }
+                        val removed = mutableListOf<String>()
+                        while (iterator.hasNext()) {
+                            val str = getRecursiveField(iterator.next(), pkgNameObjList) as String?
+                            if (isToHide(callerName, str)) {
+                                iterator.remove()
+                                isHidden = true
+                                if (data.DetailLog) removed.add(str!!)
+                            }
+                        }
                         if (isHidden) li("@Hide PKMS caller: $callerName method: ${param.method.name}")
+                        if (isHidden && data.DetailLog) ld("removeList $removed")
                     }
                 })
             }
@@ -92,7 +100,7 @@ class PackageManagerService : IXposedHookLoadPackage {
                         if (!isUseHook(callerName, hookName)) return
                         if (isToHide(callerName, param.args[0] as String)) {
                             param.result = result
-                            li("@Hide PKMS caller: $callerName method: ${param.method.name}")
+                            li("@Hide PKMS caller: $callerName method: ${param.method.name} param: ${param.args[0]}")
                         }
                     }
                 })
@@ -139,7 +147,7 @@ class PackageManagerService : IXposedHookLoadPackage {
                     if (!isUseHook(callerName, "ID detections")) return
                     if (isToHide(callerName, param.args[0] as String)) {
                         param.result = -1
-                        li("@Hide PKMS caller: $callerName method: ${param.method.name}")
+                        li("@Hide PKMS caller: $callerName method: ${param.method.name} param: ${param.args[0]}")
                     }
                 }
             }
@@ -155,7 +163,8 @@ class PackageManagerService : IXposedHookLoadPackage {
                             context.startService(Intent().apply {
                                 setClassName(BuildConfig.APPLICATION_ID, BuildConfig.APPLICATION_ID + ".ProvidePreferenceService")
                             })
-                        } catch (e: Exception) { }
+                        } catch (e: Exception) {
+                        }
                         Thread.sleep(1000)
                     }
                     li("Preferences initialized")
@@ -188,12 +197,16 @@ class PackageManagerService : IXposedHookLoadPackage {
                             if (param.result != null) {
                                 var change = false
                                 val list = mutableListOf<String>()
+                                val removed = mutableListOf<String>()
                                 for (str in param.result as Array<String>)
-                                    if (isToHide(callerName, str)) change = true
-                                    else list.add(str)
+                                    if (isToHide(callerName, str)) {
+                                        change = true
+                                        if (data.DetailLog) removed.add(str)
+                                    } else list.add(str)
                                 if (change) {
                                     param.result = list.toTypedArray()
                                     li("@Hide PKMS caller: $callerName method: ${param.method.name}")
+                                    if (data.DetailLog) ld("removeList $removed")
                                 }
                             }
                         }

diff --git a/app/src/main/res/values-zh-rCN/strings_settings.xml b/app/src/main/res/values-zh-rCN/strings_settings.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="settings_hook_mode">工作模式</string>
+    <string name="settings_need_reboot">重启手机以应用更改</string>
     <string name="settings_hook_self">Hook模块自身</string>
     <string name="settings_hook_self_summary">记得先对模块自己启用一个模板</string>
-    <string name="settings_need_reboot">重启手机以应用更改</string>
+    <string name="settings_detail_log">记录详细日志（调试用）</string>
 </resources>
diff --git a/app/src/main/res/values/strings_settings.xml b/app/src/main/res/values/strings_settings.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="settings_hook_mode">Hook mode</string>
+    <string name="settings_need_reboot">Reboot to apply mode switch</string>
     <string name="settings_hook_self">Hook self</string>
     <string name="settings_hook_self_summary">Remember to apply a template to the module itself</string>
-    <string name="settings_need_reboot">Reboot to apply mode switch</string>
+    <string name="settings_detail_log">Detail log for debugging</string>
 </resources>
diff --git a/app/src/main/res/xml/settings_preferences.xml b/app/src/main/res/xml/settings_preferences.xml
@@ -12,4 +12,8 @@
         android:key="HookSelf"
         android:summary="@string/settings_hook_self_summary"
         android:title="@string/settings_hook_self" />
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="DetailLog"
+        android:title="@string/settings_detail_log" />
 </PreferenceScreen>