fix FreeNotifications for the second time

Author: programminghoch10

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

@@ -1,7 +1,6 @@
 package de.binarynoise.freeNotifications
 
 import android.app.NotificationChannel
-import android.app.NotificationChannelGroup
 import android.os.Build
 import de.binarynoise.logger.Logger.log
 import de.binarynoise.reflection.findDeclaredField
@@ -49,7 +48,7 @@ class Hook : IXposedHookLoadPackage {
          * 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)
+            if (this.isCharUpperCase(prefix.length)) return this.removePrefix(prefix)
             return this
         }
 
@@ -77,7 +76,6 @@ class Hook : IXposedHookLoadPackage {
             return hookVariable(clazz, name, name, value)
         }
 
-        // AOSP
         hookVariable(
             NotificationChannel::class.java,
             "mBlockableSystem",
@@ -86,7 +84,6 @@ class Hook : IXposedHookLoadPackage {
         )
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            // AOSP
             hookVariable(
                 NotificationChannel::class.java,
                 "mImportanceLockedDefaultApp",
@@ -96,21 +93,28 @@ 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",
                 false,
             )
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            // AOSP
-            hookVariable(
-                NotificationChannelGroup::class.java,
-                "mBlocked",
-                false,
-            )
+        if (lpparam.packageName == "android" && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            tryAndLog("PreferencesHelperClass lockChannelsForOEM") {
+                val PreferencesHelperClass = Class.forName("com.android.server.notification.PreferencesHelper", false, lpparam.classLoader)
+                XposedHelpers.findAndHookMethod(
+                    PreferencesHelperClass,
+                    "lockChannelsForOEM",
+                    Array<String>::class.java,
+                    DO_NOTHING,
+                )
+            }
+            tryAndLog("NotificationManagerService NON_BLOCKABLE_DEFAULT_ROLES") {
+                val NotificationManagerService =
+                    Class.forName("com.android.server.notification.NotificationManagerService", false, lpparam.classLoader)
+                XposedHelpers.setStaticObjectField(NotificationManagerService, "NON_BLOCKABLE_DEFAULT_ROLES", emptyArray<String>())
+            }
         }
     }
 }