fix off-by-one

Author: binarynoise

FreeNotifications/src/main/java/de/binarynoise/freeNotifications/Hook.kt

@@ -16,68 +16,6 @@ import de.robv.android.xposed.XC_MethodHook as MethodHook
 class Hook : IXposedHookLoadPackage {
 
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
-        
-        fun hookVariable(
-            clazz: Class<*>,
-            variableName: String,
-            setMethodName: String,
-            getMethodName: String,
-            value: Boolean,
-        ) {
-            tryAndLog("${clazz.simpleName} after constructor $variableName") {
-                val mVariable = clazz.findDeclaredField(variableName)
-                XposedBridge.hookAllConstructors(clazz, object : MethodHook() {
-                    override fun afterHookedMethod(param: MethodHookParam) {
-                        mVariable.set(param.thisObject, value)
-                    }
-                })
-            }
-            tryAndLog("${clazz.simpleName} $getMethodName") {
-                XposedHelpers.findAndHookMethod(clazz, getMethodName, returnConstant(value))
-            }
-            tryAndLog("${clazz.simpleName} $setMethodName") {
-                XposedHelpers.findAndHookMethod(clazz, setMethodName, Boolean::class.java, DO_NOTHING)
-            }
-        }
-        
-        fun String.isCharUpperCase(index: Int): Boolean {
-            return this[index] == this[index].uppercaseChar()
-        }
-        
-        /**
-         * Remove prefix only if it is used in a CamelCase sentence,
-         * only if the letter following the prefix is uppercase.
-         */
-        fun String.removeCamelCasePrefix(prefix: String): String {
-            if (!this.isCharUpperCase(prefix.length + 1)) return this.removePrefix(prefix)
-            return this
-        }
-        
-        fun sanitizeVariableName(name: String): String {
-            return name.removeCamelCasePrefix("m")
-                .removeCamelCasePrefix("set")
-                .removeCamelCasePrefix("is")
-                .removeCamelCasePrefix("get")
-                .replaceFirstChar { it.uppercaseChar() }
-        }
-        
-        fun hookVariable(clazz: Class<*>, variableName: String, functionName: String, value: Boolean) {
-            val sanitizedVariableName = sanitizeVariableName(variableName)
-            val sanitizedFunctionName = sanitizeVariableName(functionName)
-            return hookVariable(
-                clazz,
-                "m$sanitizedVariableName",
-                "set$sanitizedFunctionName",
-                "is$sanitizedFunctionName",
-                value,
-            )
-        }
-        
-        fun hookVariable(clazz: Class<*>, name: String, value: Boolean) {
-            return hookVariable(clazz, name, name, value)
-        }
-        
-        // AOSP
         hookVariable(
             NotificationChannel::class.java,
             "mBlockableSystem",
@@ -86,7 +24,6 @@ class Hook : IXposedHookLoadPackage {
         )
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            // AOSP
             hookVariable(
                 NotificationChannel::class.java,
                 "mImportanceLockedDefaultApp",
@@ -96,7 +33,6 @@ class Hook : IXposedHookLoadPackage {
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
-            // AOSP
             hookVariable(
                 NotificationChannel::class.java,
                 "mImportanceLockedByOEM",
@@ -105,22 +41,68 @@ class Hook : IXposedHookLoadPackage {
         }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            // AOSP
             hookVariable(
                 NotificationChannelGroup::class.java,
                 "mBlocked",
                 false,
             )
         }
     }
+    
+    fun String.isCharUpperCase(index: Int): Boolean {
+        return this[index].isUpperCase()
+    }
+    
+    /**
+     * Remove prefix only if it is used in a CamelCase sentence,
+     * only if the letter following the prefix is uppercase.
+     */
+    fun String.removeCamelCasePrefix(prefix: String): String {
+        if (this.isCharUpperCase(prefix.length)) return this.removePrefix(prefix)
+        return this
+    }
+    
+    fun sanitizeVariableName(name: String): String {
+        return name.removeCamelCasePrefix("m")
+            .removeCamelCasePrefix("set")
+            .removeCamelCasePrefix("is")
+            .removeCamelCasePrefix("get")
+            .replaceFirstChar { it.uppercaseChar() }
+    }
+    
+    fun hookVariable(clazz: Class<*>, variableName: String, setMethodName: String, getMethodName: String, value: Boolean) {
+        tryAndLog("${clazz.simpleName} after constructor $variableName") {
+            val mVariable = clazz.findDeclaredField(variableName)
+            XposedBridge.hookAllConstructors(clazz, object : MethodHook() {
+                override fun afterHookedMethod(param: MethodHookParam) {
+                    mVariable.set(param.thisObject, value)
+                }
+            })
+        }
+        tryAndLog("${clazz.simpleName} $getMethodName") {
+            XposedHelpers.findAndHookMethod(clazz, getMethodName, returnConstant(value))
+        }
+        tryAndLog("${clazz.simpleName} $setMethodName") {
+            XposedHelpers.findAndHookMethod(clazz, setMethodName, Boolean::class.java, DO_NOTHING)
+        }
+    }
+    
+    fun hookVariable(clazz: Class<*>, variableName: String, functionName: String, value: Boolean) {
+        val sanitizedVariableName = sanitizeVariableName(variableName)
+        val sanitizedFunctionName = sanitizeVariableName(functionName)
+        return hookVariable(clazz, "m$sanitizedVariableName", "set$sanitizedFunctionName", "is$sanitizedFunctionName", value)
+    }
+    
+    fun hookVariable(clazz: Class<*>, name: String, value: Boolean) {
+        return hookVariable(clazz, name, name, value)
+    }
 }
 
 inline fun tryAndLog(message: String, block: () -> Unit) {
-    return try {
+    try {
         block()
         log("hook $message successful!")
     } catch (t: Throwable) {
         log("hook $message failed!", t)
-        XposedBridge.log(t)
     }
 }