Improve loadSenderPlayedMethod in Unobfuscator

Signed-off-by: Dev4Mod <[email protected]>

Author: Dev4Mod

app/src/main/java/com/wmods/wppenhacer/xposed/core/components/FMessageWpp.java

@@ -10,7 +10,9 @@
 import de.robv.android.xposed.XposedBridge;
 import de.robv.android.xposed.XposedHelpers;
 
-/** @noinspection unused*/
+/**
+ * @noinspection unused
+ */
 public class FMessageWpp {
 
     public static Class<?> TYPE;
@@ -55,6 +57,17 @@ public static void initialize(ClassLoader classLoader) {
         }
     }
 
+    public static boolean checkUnsafeIsFMessage(ClassLoader classLoader, Class<?> clazz) throws Exception {
+        Class<?> FmessageClass = Unobfuscator.loadFMessageClass(classLoader);
+        if (FmessageClass.isAssignableFrom(clazz)) return true;
+        var interfaces = FmessageClass.getInterfaces();
+        for (Class<?> anInterface : interfaces) {
+            if (anInterface == clazz) return true;
+        }
+        return false;
+    }
+
+
     public Object getUserJid() {
         try {
             return userJidMethod.invoke(fmessage);
@@ -127,7 +140,9 @@ public String getMessageStr() {
         }
     }
 
-    /** @noinspection BooleanMethodIsAlwaysInverted*/
+    /**
+     * @noinspection BooleanMethodIsAlwaysInverted
+     */
     public boolean isMediaFile() {
         try {
             return abstractMediaMessageClass.isInstance(fmessage);
@@ -177,7 +192,9 @@ public boolean isViewOnce() {
         return (media_type == 82 || media_type == 42 || media_type == 43);
     }
 
-    /** @noinspection unused*/
+    /**
+     * @noinspection unused
+     */
     public static class Key {
         public static Class<?> TYPE;
 

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

@@ -832,7 +832,8 @@ public synchronized static Method loadBlueOnReplayWaJobManagerMethod(ClassLoader
     public synchronized static Class loadArchiveChatClass(ClassLoader loader) throws Exception {
         return UnobfuscatorCache.getInstance().getClass(loader, () -> {
             var clazz = findFirstClassUsingStrings(loader, StringMatchType.Contains, "archive/set-content-indicator-to-empty");
-            if (clazz == null) clazz = findFirstClassUsingStrings(loader, StringMatchType.Contains, "archive/Unsupported mode in ArchivePreviewView:");
+            if (clazz == null)
+                clazz = findFirstClassUsingStrings(loader, StringMatchType.Contains, "archive/Unsupported mode in ArchivePreviewView:");
             if (clazz == null) throw new Exception("ArchiveHideView method not found");
             return clazz;
         });
@@ -911,9 +912,11 @@ public synchronized static Method loadSendPresenceMethod(ClassLoader loader) thr
             if (methodCallers.isEmpty()) {
                 var method = methodData.get(0);
                 var superMethodInterfaces = method.getDeclaredClass().getInterfaces();
-                if (superMethodInterfaces.isEmpty()) throw new Exception("SendPresence method interface list empty");
+                if (superMethodInterfaces.isEmpty())
+                    throw new Exception("SendPresence method interface list empty");
                 var superMethod = superMethodInterfaces.get(0).findMethod(FindMethod.create().matcher(MethodMatcher.create().name(method.getName()))).firstOrNull();
-                if (superMethod == null) throw new Exception("SendPresence method interface method not found");
+                if (superMethod == null)
+                    throw new Exception("SendPresence method interface method not found");
                 methodCallers = superMethod.getCallers();
             }
             var newMethod = methodCallers.firstOrNull(method1 -> method1.getParamCount() == 4);
@@ -1677,16 +1680,28 @@ public synchronized static Class<?> loadSenderPlayedClass(ClassLoader classLoade
     public synchronized static Method loadSenderPlayedMethod(ClassLoader classLoader) throws Exception {
         return UnobfuscatorCache.getInstance().getMethod(classLoader, () -> {
             var clazz = loadSenderPlayedClass(classLoader);
-            var fmessageClass = loadFMessageClass(classLoader);
+            var abstractMediaMessageClass = Unobfuscator.loadAbstractMediaMessageClass(classLoader);
+            var interfaces = abstractMediaMessageClass.getInterfaces();
+
+            ArrayList<Class> interfacesList = new ArrayList<>();
+            interfacesList.add(abstractMediaMessageClass);
+            interfacesList.addAll(Arrays.asList(interfaces));
+
             Method methodResult = null;
+            main_loop:
             for (var method : clazz.getMethods()) {
-                if (method.getParameterCount() == 1 && fmessageClass.isAssignableFrom(method.getParameterTypes()[0])) {
-                    methodResult = method;
-                    break;
+                if (method.getParameterCount() != 1) continue;
+                var parameterType = method.getParameterTypes()[0];
+                for (var interfaceClass : interfacesList) {
+                    if (interfaceClass.isAssignableFrom(parameterType)) {
+                        methodResult = method;
+                        break main_loop;
+                    }
                 }
             }
 
             // 2.25.19.xx, they refactored the SenderPlayed class
+            var fmessageClass = Unobfuscator.loadFMessageClass(classLoader);
             if (methodResult == null) {
                 var method = findFirstMethodUsingStrings(classLoader, StringMatchType.Contains, "mediaHash and fileType not both present for upload URL generation");
                 if (method != null) {
@@ -1708,7 +1723,6 @@ public synchronized static Method loadSenderPlayedMethod(ClassLoader classLoader
             return methodResult;
         });
     }
-
     public synchronized static Method loadSenderPlayedBusiness(ClassLoader classLoader) throws Exception {
         return UnobfuscatorCache.getInstance().getMethod(classLoader, () -> {
             var loadSenderPlayed = loadSenderPlayedClass(classLoader);