Merge pull request #257 from frknkrc44/fix-25-4

add 25.4.xx stable support

Author: Dev4Mod

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

@@ -24,6 +24,7 @@
 import org.luckypray.dexkit.query.enums.StringMatchType;
 import org.luckypray.dexkit.query.matchers.ClassMatcher;
 import org.luckypray.dexkit.query.matchers.MethodMatcher;
+import org.luckypray.dexkit.query.matchers.MethodsMatcher;
 import org.luckypray.dexkit.query.matchers.base.OpCodesMatcher;
 import org.luckypray.dexkit.result.ClassData;
 import org.luckypray.dexkit.result.ClassDataList;
@@ -763,12 +764,20 @@ public synchronized static Field loadStatusPlaybackViewField(ClassLoader loader)
                     ClassMatcher.create().methodCount(1).addFieldForType(class1)
             ));
             if (classView.isEmpty()) classView = dexkit.findClass(FindClass.create().matcher(
-                    ClassMatcher.create().methodCount(1, 2)
-                            .addMethod(MethodMatcher.create().paramTypes(View.class, boolean.class, boolean.class))
+                    ClassMatcher.create()
+                            .addMethod(MethodMatcher.create().invokeMethods(
+                                    MethodsMatcher.create().methods(
+                                            Collections.singletonList(
+                                                    MethodMatcher.create().declaredClass(ClassMatcher.create().addUsingString("INVOKE_RETURN"))
+                                                            .paramTypes(View.class, int.class)
+                                            )
+                                    )
+                            ))
                             .addFieldForType(class1)
             ));
             if (classView.isEmpty()) throw new Exception("StatusPlaybackView field not found");
-            Class<?> clsViewStatus = classView.get(0).getInstance(loader);
+            Class<?> clsViewStatus = classView.single(classData -> classData.getSuperClass().getSimpleName().equals("Object")).getInstance(loader);
+            if (classView.isEmpty()) throw new Exception("StatusPlaybackView field not found 2");
             Class<?> class2 = XposedHelpers.findClass("com.whatsapp.status.playback.fragment.StatusPlaybackBaseFragment", loader);
             return Arrays.stream(class2.getDeclaredFields()).filter(f -> f.getType() == clsViewStatus).findFirst().orElse(null);
         });
@@ -1585,10 +1594,22 @@ public synchronized static Class loadListChannelItemClass(ClassLoader classLoade
     }
 
     public synchronized static Method loadTextStatusComposer(ClassLoader classLoader) throws Exception {
-        var methods = dexkit.findMethod(FindMethod.create().matcher(MethodMatcher.create().addUsingString("background_color_key", StringMatchType.Equals).paramCount(1)));
-        if (methods.isEmpty())
-            return null;
-        return methods.single().getMethodInstance(classLoader);
+        return UnobfuscatorCache.getInstance().getMethod(classLoader, () -> {
+            var methods = dexkit.findMethod(FindMethod.create().matcher(MethodMatcher.create().addUsingString("background_color_key", StringMatchType.Equals)));
+            for (MethodData method : methods) {
+                var targetMethod =  method.getDeclaredClass().findMethod(
+                        FindMethod.create().matcher(
+                                MethodMatcher.create().returnType(int.class).paramCount(1)
+                        )
+                );
+
+                if (!targetMethod.isEmpty()) {
+                    return targetMethod.single().getMethodInstance(classLoader);
+                }
+            }
+
+            throw new RuntimeException("TextStatusComposer class not found");
+        });
     }
 
     public synchronized static Method loadTextStatusComposer2(ClassLoader classLoader) throws Exception {

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

@@ -47,8 +47,9 @@ public void doHook() throws Throwable {
         XposedBridge.hookMethod(onInsertReceipt, new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                var type = (int) param.args[1];
-                var id = (long) param.args[2];
+                var param1IsInt = param.args[1] instanceof Integer; // true if WA < 25.4
+                var type = (int) param.args[param1IsInt ? 1 : 2];
+                var id = (long) param.args[param1IsInt ? 2 : 3];
                 if (type != 13) return;
                 var PhoneUserJid = param.args[0];
                 CompletableFuture.runAsync(() -> {

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

@@ -117,11 +117,13 @@
         <item>2.25.1.xx</item>
         <item>2.25.2.xx</item>
         <item>2.25.3.xx</item>
+        <item>2.25.4.xx</item>
     </string-array>
     <string-array name="supported_versions_business">
         <item>2.25.1.xx</item>
         <item>2.25.2.xx</item>
         <item>2.25.3.xx</item>
+        <item>2.25.4.xx</item>
     </string-array>
     <string-array name="image_picker">
         <item>image/*</item>