Refactor message handling and add support for version 2.25.37

Author: Dev4Mod

app/src/main/java/com/wmods/wppenhacer/adapter/IGStatusAdapter.java

@@ -146,9 +146,9 @@ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup
         return convertView;
     }
 
-    public IGStatusAdapter(@NonNull Context context, @NonNull Class<?> statusInfoClazz) {
+    public IGStatusAdapter(@NonNull Context context, @NonNull Class<?> statusInfoClazz) throws Exception {
         super(context, 0);
-        this.clazzImageStatus = XposedHelpers.findClass("com.whatsapp.status.ContactStatusThumbnail", this.getContext().getClassLoader());
+        this.clazzImageStatus = Unobfuscator.findFirstClassUsingName(this.getContext().getClassLoader(), StringMatchType.EndsWith, ".ContactStatusThumbnail");
         this.statusInfoClazz = statusInfoClazz;
         this.setCountStatus = ReflectionUtils.findMethodUsingFilter(this.clazzImageStatus, m -> m.getParameterCount() == 3 && Arrays.equals(new Class[]{int.class, int.class, int.class}, m.getParameterTypes()));
     }

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

@@ -308,7 +308,16 @@ public synchronized static Field loadBroadcastTagField(ClassLoader classLoader)
     }
 
     public synchronized static Class<?> loadForwardClassMethod(ClassLoader classLoader) throws Exception {
-        return UnobfuscatorCache.getInstance().getClass(classLoader, () -> findFirstClassUsingStrings(classLoader, StringMatchType.Contains, "UserActions/userActionForwardMessage"));
+        return UnobfuscatorCache.getInstance().getClass(classLoader, () -> {
+            for (var s : new String[]{
+                    "UserActions/userActionForwardMessage",
+                    "UserActionsMessageForwarding/userActionForwardMessage"
+            }) {
+                var cls = findFirstClassUsingStrings(classLoader, StringMatchType.Contains, s);
+                if (cls != null) return cls;
+            }
+            throw new ClassNotFoundException("ForwardClass method not found");
+        });
     }
 
 

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

@@ -5,6 +5,7 @@
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.wmods.wppenhacer.xposed.core.Feature;
 import com.wmods.wppenhacer.xposed.core.WppCore;
@@ -13,6 +14,7 @@
 import com.wmods.wppenhacer.xposed.core.db.MessageStore;
 import com.wmods.wppenhacer.xposed.core.devkit.Unobfuscator;
 import com.wmods.wppenhacer.xposed.core.devkit.UnobfuscatorCache;
+import com.wmods.wppenhacer.xposed.utils.DebugUtils;
 import com.wmods.wppenhacer.xposed.utils.ReflectionUtils;
 import com.wmods.wppenhacer.xposed.utils.ResId;
 import com.wmods.wppenhacer.xposed.utils.Utils;
@@ -95,17 +97,7 @@ protected void afterHookedMethod(MethodHookParam param) {
             @Override
             protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                 Object obj = ReflectionUtils.getArg(param.args, param.method.getDeclaringClass(), 0);
-                var objFMessage = param.args[0];
-                if (!FMessageWpp.TYPE.isInstance(objFMessage)) {
-                    var field = ReflectionUtils.findFieldUsingFilter(objFMessage.getClass(), f -> f.getType() == FMessageWpp.TYPE);
-                    if (field != null) {
-                        objFMessage = field.get(objFMessage);
-                    } else {
-                        var field1 = ReflectionUtils.findFieldUsingFilter(objFMessage.getClass(), f -> f.getType() == FMessageWpp.Key.TYPE);
-                        var key = field1.get(objFMessage);
-                        objFMessage = WppCore.getFMessageFromKey(key);
-                    }
-                }
+                var objFMessage = findObjectFMessage(param);
                 var field = ReflectionUtils.getFieldByType(param.method.getDeclaringClass(), statusPlaybackClass);
 
                 Object objView = field.get(obj);
@@ -127,6 +119,30 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
 
     }
 
+    @Nullable
+    private static Object findObjectFMessage(XC_MethodHook.MethodHookParam param) throws IllegalAccessException {
+        if (FMessageWpp.TYPE.isInstance(param.args[0]))
+            return param.args[0];
+
+        if (param.args.length > 1) {
+            if (FMessageWpp.TYPE.isInstance(param.args[1]))
+                return param.args[1];
+            var FMessageField = ReflectionUtils.findFieldUsingFilterIfExists(param.args[1].getClass(), f -> FMessageWpp.TYPE.isAssignableFrom(f.getType()));
+            if (FMessageField != null) {
+                return FMessageField.get(param.args[1]);
+            }
+        }
+
+        var field = ReflectionUtils.findFieldUsingFilterIfExists(param.args[0].getClass(), f -> f.getType() == FMessageWpp.TYPE);
+        if (field != null)
+            return field.get(param.args[0]);
+
+        var field1 = ReflectionUtils.findFieldUsingFilter(param.args[0].getClass(), f -> f.getType() == FMessageWpp.Key.TYPE);
+        var key = field1.get(param.args[0]);
+        return WppCore.getFMessageFromKey(key);
+
+    }
+
     @NonNull
     @Override
     public String getPluginName() {

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

@@ -58,8 +58,8 @@ public static JSONObject getJSON(String number) {
     public void doHook() throws Throwable {
         if (Objects.equals(Utils.xprefs.getString("custom_privacy_type", "0"), "0")) return;
 
-        Class<?> ContactInfoActivityClass = Unobfuscator.findFirstClassUsingName(classLoader, StringMatchType.EndsWith, "ContactInfoActivity");
-        Class<?> GroupInfoActivityClass = Unobfuscator.findFirstClassUsingName(classLoader, StringMatchType.EndsWith, "GroupChatInfoActivity");
+        Class<?> ContactInfoActivityClass = Unobfuscator.findFirstClassUsingName(classLoader, StringMatchType.EndsWith, ".ContactInfoActivity");
+        Class<?> GroupInfoActivityClass = Unobfuscator.findFirstClassUsingName(classLoader, StringMatchType.EndsWith, ".GroupChatInfoActivity");
         Class<?> userJidClass = Unobfuscator.findFirstClassUsingName(classLoader, StringMatchType.EndsWith, "jid.UserJid");
         Class<?> groupJidClass = Unobfuscator.findFirstClassUsingName(classLoader, StringMatchType.EndsWith, "jid.GroupJid");
 

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

@@ -131,6 +131,7 @@
         <item>2.25.34.xx</item>
         <item>2.25.35.xx</item>
         <item>2.25.36.xx</item>
+        <item>2.25.37.xx</item>
     </string-array>
     <string-array name="supported_versions_business">
         <item>2.25.25.xx</item>
@@ -145,6 +146,7 @@
         <item>2.25.34.xx</item>
         <item>2.25.35.xx</item>
         <item>2.25.36.xx</item>
+        <item>2.25.37.xx</item>
     </string-array>
     <string-array name="image_picker">
         <item>image/*</item>