Merge pull request #490 from frknkrc44/fix-25-35-xx

Add 2.25.35.xx support

Author: Dev4Mod

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

@@ -334,6 +334,32 @@ public synchronized static Class getTextStatusComposerFragmentClass(@NonNull Cla
         throw new Exception("TextStatusComposerFragmentClass not found");
     }
 
+    public synchronized static Class getVoipManagerClass(@NonNull ClassLoader loader) throws Exception {
+        var classes = new String[]{
+                "com.whatsapp.voipcalling.Voip",
+                "com.whatsapp.calling.voipcalling.Voip"
+        };
+        Class<?> result = null;
+        for (var clazz : classes) {
+            if ((result = XposedHelpers.findClassIfExists(clazz, loader)) != null)
+                return result;
+        }
+        throw new Exception("VoipManagerClass not found");
+    }
+
+    public synchronized static Class getVoipCallInfoClass(@NonNull ClassLoader loader) throws Exception {
+        var classes = new String[]{
+                "com.whatsapp.voipcalling.CallInfo",
+                "com.whatsapp.calling.infra.voipcalling.CallInfo"
+        };
+        Class<?> result = null;
+        for (var clazz : classes) {
+            if ((result = XposedHelpers.findClassIfExists(clazz, loader)) != null)
+                return result;
+        }
+        throw new Exception("VoipCallInfoClass not found");
+    }
+
 //    public static Activity getActivityBySimpleName(String name) {
 //        for (var activity : activities) {
 //            if (activity.getClass().getSimpleName().equals(name)) {

app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java

@@ -1985,7 +1985,8 @@ public static Class<?> getClassByName(String className, ClassLoader classLoader)
 
     public static Class loadVoipManager(ClassLoader classLoader) throws Exception {
         return UnobfuscatorCache.getInstance().getClass(classLoader, () -> {
-            var superClasses = dexkit.findClass(FindClass.create().matcher(ClassMatcher.create().superClass("com.whatsapp.voipcalling.Voip")));
+            var voipClass = WppCore.getVoipManagerClass(classLoader);
+            var superClasses = dexkit.findClass(FindClass.create().matcher(ClassMatcher.create().superClass(voipClass.getName())));
             if (superClasses.isEmpty())
                 throw new ClassNotFoundException("VoipManager Class not found");
             for (var supclass : superClasses) {

app/src/main/java/com/wmods/wppenhacer/xposed/features/privacy/CallPrivacy.java

@@ -43,7 +43,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
             }
         });
 
-        var clazzVoip = XposedHelpers.findClass("com.whatsapp.voipcalling.Voip", classLoader);
+        var clazzVoip = WppCore.getVoipManagerClass(classLoader);
         var endCallMethod = ReflectionUtils.findMethodUsingFilter(clazzVoip, m -> m.getName().equals("endCall"));
         var rejectCallMethod = ReflectionUtils.findMethodUsingFilter(clazzVoip, m -> m.getName().equals("rejectCall"));
 
@@ -53,7 +53,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                 Object callinfo;
-                Class<?> callInfoClass = XposedHelpers.findClass("com.whatsapp.voipcalling.CallInfo", classLoader);
+                Class<?> callInfoClass = WppCore.getVoipCallInfoClass(classLoader);
                 if (param.args[0] instanceof Message) {
                     callinfo = ((Message) param.args[0]).obj;
                 } else if (param.args.length > 1 && callInfoClass.isInstance(param.args[1])) {
@@ -92,7 +92,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
             }
         });
 
-        XposedBridge.hookAllMethods(classLoader.loadClass("com.whatsapp.voipcalling.Voip"), "nativeHandleIncomingXmppOffer", new XC_MethodHook() {
+        XposedBridge.hookAllMethods(WppCore.getVoipManagerClass(classLoader), "nativeHandleIncomingXmppOffer", new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                 if (!prefs.getString("call_type", "no_internet").equals("no_internet")) return;

app/src/main/java/com/wmods/wppenhacer/xposed/features/privacy/HideSeen.java

@@ -53,8 +53,15 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                     return;
                 }
                 var lid = (String) XposedHelpers.getObjectField(sendReadReceiptJob, "jid");
-                var userJid = new FMessageWpp.UserJid(lid);
-                if (userJid.isNull()) return;
+                FMessageWpp.UserJid userJid = null;
+                try {
+                    userJid = new FMessageWpp.UserJid(lid);
+                    if (userJid.isNull()) return;
+                } catch (Throwable e) {
+                    // WhatsApp crashes when attempting to create UserJid from MeJid or LidMeJid
+                    // and this issue can be ignored since we don't need to hide something from ourself
+                    return;
+                }
                 var privacy = CustomPrivacy.getJSON(userJid.getPhoneNumber());
 
                 var customHideRead = privacy.optBoolean("HideSeen", hideread);

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

@@ -129,6 +129,7 @@
         <item>2.25.32.xx</item>
         <item>2.25.33.xx</item>
         <item>2.25.34.xx</item>
+        <item>2.25.35.xx</item>
     </string-array>
     <string-array name="supported_versions_business">
         <item>2.25.25.xx</item>
@@ -141,6 +142,7 @@
         <item>2.25.32.xx</item>
         <item>2.25.33.xx</item>
         <item>2.25.34.xx</item>
+        <item>2.25.35.xx</item>
     </string-array>
     <string-array name="image_picker">
         <item>image/*</item>