feat: Add 2.25.14.xx support

Author: frknkrc44

app/src/main/java/com/wmods/wppenhacer/xposed/core/WppCore.java

@@ -61,6 +61,7 @@ public class WppCore {
     private static SQLiteDatabase mWaDatabase;
     public static BaseClient client;
     private static Object mCachedMessageStore;
+    private static Class<?> mSettingsNotificationsClass;
 
 
     public static void Initialize(ClassLoader loader, XSharedPreferences pref) throws Exception {
@@ -77,6 +78,9 @@ public static void Initialize(ClassLoader loader, XSharedPreferences pref) throw
         convChatField = Unobfuscator.loadAntiRevokeConvChatField(loader);
         chatJidField = Unobfuscator.loadAntiRevokeChatJidField(loader);
 
+        // Settings notifications activity (required for ActivityController.EXPORTED_ACTIVITY)
+        mSettingsNotificationsClass = getSettingsNotificationsActivityClass(loader);
+
         // StartUpPrefs
         var startPrefsConfig = Unobfuscator.loadStartPrefsConfig(loader);
         XposedBridge.hookMethod(startPrefsConfig, new XC_MethodHook() {
@@ -231,6 +235,33 @@ public synchronized static Class getViewOnceViewerActivityClass(@NonNull ClassLo
                 : XposedHelpers.findClass("com.whatsapp.viewonce.ui.messaging.ViewOnceViewerActivity", loader);
     }
 
+    public synchronized static Class getAboutActivityClass(@NonNull ClassLoader loader) {
+        Class oldClass = XposedHelpers.findClassIfExists("com.whatsapp.settings.About", loader);
+
+        return oldClass != null
+                ? oldClass
+                : XposedHelpers.findClass("com.whatsapp.settings.ui.About", loader);
+    }
+
+    public synchronized static Class getSettingsNotificationsActivityClass(@NonNull ClassLoader loader) {
+        if (mSettingsNotificationsClass != null)
+            return mSettingsNotificationsClass;
+
+        Class oldClass = XposedHelpers.findClassIfExists("com.whatsapp.settings.SettingsNotifications", loader);
+
+        return oldClass != null
+                ? oldClass
+                : XposedHelpers.findClass("com.whatsapp.settings.ui.SettingsNotifications", loader);
+    }
+
+    public synchronized static Class getDataUsageActivityClass(@NonNull ClassLoader loader) {
+        Class oldClass = XposedHelpers.findClassIfExists("com.whatsapp.settings.SettingsDataUsageActivity", loader);
+
+        return oldClass != null
+                ? oldClass
+                : XposedHelpers.findClass("com.whatsapp.settings.ui.SettingsDataUsageActivity", loader);
+    }
+
 //    public static Activity getActivityBySimpleName(String name) {
 //        for (var activity : activities) {
 //            if (activity.getClass().getSimpleName().equals(name)) {

app/src/main/java/com/wmods/wppenhacer/xposed/features/customization/CustomToolbar.java

@@ -77,7 +77,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
             }
         });
 
-        XposedHelpers.findAndHookMethod("com.whatsapp.settings.About", classLoader, "onCreate", classLoader.loadClass("android.os.Bundle"),
+        XposedHelpers.findAndHookMethod(WppCore.getAboutActivityClass(classLoader), "onCreate", classLoader.loadClass("android.os.Bundle"),
                 new XC_MethodHook() {
                     @SuppressLint("SetTextI18n")
                     @Override

app/src/main/java/com/wmods/wppenhacer/xposed/features/general/Others.java

@@ -558,7 +558,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
     private void hookProps() throws Exception {
         var methodPropsBoolean = Unobfuscator.loadPropsBooleanMethod(classLoader);
         logDebug(Unobfuscator.getMethodDescriptor(methodPropsBoolean));
-        var dataUsageActivityClass = XposedHelpers.findClass("com.whatsapp.settings.SettingsDataUsageActivity", classLoader);
+        var dataUsageActivityClass = WppCore.getDataUsageActivityClass(classLoader);
         XposedBridge.hookMethod(methodPropsBoolean, new XC_MethodHook() {
             @Override
             protected void afterHookedMethod(MethodHookParam param) throws Throwable {

app/src/main/java/com/wmods/wppenhacer/xposed/features/others/ActivityController.java

@@ -30,7 +30,7 @@
 
 public class ActivityController extends Feature {
 
-    public static final String EXPORTED_ACTIVITY = "com.whatsapp.settings.SettingsNotifications";
+    public static final String EXPORTED_ACTIVITY = WppCore.getSettingsNotificationsActivityClass(ClassLoader.getSystemClassLoader()).getName();
     private static String Key;
 
     public ActivityController(@NonNull ClassLoader classLoader, @NonNull XSharedPreferences preferences) {

app/src/main/res/values/arrays.xml

@@ -128,6 +128,7 @@
         <item>2.25.11.xx</item>
         <item>2.25.12.xx</item>
         <item>2.25.13.xx</item>
+        <item>2.25.14.xx</item>
     </string-array>
     <string-array name="supported_versions_business">
         <item>2.25.5.xx</item>
@@ -139,6 +140,7 @@
         <item>2.25.11.xx</item>
         <item>2.25.12.xx</item>
         <item>2.25.13.xx</item>
+        <item>2.25.14.xx</item>
     </string-array>
     <string-array name="image_picker">
         <item>image/*</item>