Misc fixes for OOS13

DHD2280 · Apr 25, 2024 · f594aa6 · f594aa6
1 parent 786cb58
commit f594aa6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/...src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/statusbar/StatusbarIcons.java b/...src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/statusbar/StatusbarIcons.java
@@ -1,5 +1,6 @@
 package it.dhd.oxygencustomizer.xposed.hooks.systemui.statusbar;
 
+import static de.robv.android.xposed.XposedBridge.log;
 import static de.robv.android.xposed.XposedHelpers.callMethod;
 import static de.robv.android.xposed.XposedHelpers.findAndHookMethod;
 import static de.robv.android.xposed.XposedHelpers.findClass;
@@ -11,6 +12,7 @@
 
 import de.robv.android.xposed.XC_MethodHook;
 import de.robv.android.xposed.callbacks.XC_LoadPackage;
+import it.dhd.oxygencustomizer.BuildConfig;
 import it.dhd.oxygencustomizer.xposed.XposedMods;
 
 public class StatusbarIcons extends XposedMods {
@@ -29,27 +31,31 @@ public void updatePrefs(String... Key) {
 
     @Override
     public void handleLoadPackage(XC_LoadPackage.LoadPackageParam lpparam) throws Throwable {
-        Class<?> OplusPhoneStatusBarPolicyExImpl = findClass("com.oplus.systemui.statusbar.phone.OplusPhoneStatusBarPolicyExImpl", lpparam.classLoader);
-
-        // private final void updateBluetoothIcon(int i, int i2, CharSequence charSequence, boolean z) {
-        findAndHookMethod(OplusPhoneStatusBarPolicyExImpl, "updateBluetoothIcon",
-                int.class,
-                int.class,
-                CharSequence.class,
-                boolean.class, new XC_MethodHook() {
-            @Override
-            protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                boolean enabled = (boolean) param.args[3];
-
-                if (!enabled || !hideBluetooth) return;
-
-                Object bluetoothController = getObjectField(param.thisObject, "bluetoothController");
-                boolean connected = (boolean) callMethod(bluetoothController, "isBluetoothConnected");
-
-                if (!connected)
-                    param.setResult(connected);
-            }
-        });
+        try {
+            Class<?> OplusPhoneStatusBarPolicyExImpl = findClass("com.oplus.systemui.statusbar.phone.OplusPhoneStatusBarPolicyExImpl", lpparam.classLoader);
+
+            // private final void updateBluetoothIcon(int i, int i2, CharSequence charSequence, boolean z) {
+            findAndHookMethod(OplusPhoneStatusBarPolicyExImpl, "updateBluetoothIcon",
+                    int.class,
+                    int.class,
+                    CharSequence.class,
+                    boolean.class, new XC_MethodHook() {
+                @Override
+                protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
+                    boolean enabled = (boolean) param.args[3];
+
+                    if (!enabled || !hideBluetooth) return;
+
+                    Object bluetoothController = getObjectField(param.thisObject, "bluetoothController");
+                    boolean connected = (boolean) callMethod(bluetoothController, "isBluetoothConnected");
+
+                    if (!connected)
+                        param.setResult(connected);
+                }
+            });
+        } catch (Throwable t) {
+            log(this.getClass().getSimpleName() + " - Class Not Found " + t.toString());
+        }
 
     }
 

diff --git a/...n/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/statusbar/StatusbarNotification.java b/...n/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/statusbar/StatusbarNotification.java
@@ -107,7 +107,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
         try {
             SystemPromptController = findClass("com.oplus.systemui.statusbar.controller.SystemPromptController", lpparam.classLoader);
         } catch (Throwable t) {
-            SystemPromptController = findClass("com.oplusos.systemui.controller.SystemPromptController", lpparam.classLoader); // OOS 13
+            SystemPromptController = findClass("com.oplusos.systemui.statusbar.policy.SystemPromptController", lpparam.classLoader); // OOS 13
         }
         findAndHookMethod(SystemPromptController, "updateDeveloperMode", new XC_MethodHook() {
             @Override