Merge pull request #278 from frknkrc44/fix-tablet-mode

improve tablet mode support

Author: Dev4Mod

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

@@ -324,7 +324,16 @@ public static String getCurrentRawJID() {
         try {
             var conversation = getCurrentConversation();
             if (conversation == null) return null;
-            var chatField = convChatField.get(conversation);
+            Object chatField;
+            if (conversation.getClass().getSimpleName().equals("HomeActivity")) {
+                // tablet mode found
+                var convFragmentMethod = Unobfuscator.loadHomeConversationFragmentMethod(conversation.getClassLoader());
+                var convFragment = convFragmentMethod.invoke(null, conversation);
+                var convField = Unobfuscator.loadAntiRevokeConvFragmentField(conversation.getClassLoader());
+                chatField = convField.get(convFragment);
+            } else {
+                chatField = convChatField.get(conversation);
+            }
             var chatJidObj = chatJidField.get(chatField);
             return getRawString(chatJidObj);
         } catch (Exception e) {

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

@@ -689,6 +689,29 @@ public synchronized static Method loadAntiRevokeOnStartMethod(ClassLoader loader
         });
     }
 
+    public synchronized static Method loadHomeConversationFragmentMethod(ClassLoader loader) throws Exception {
+        return UnobfuscatorCache.getInstance().getMethod(loader, () -> {
+            var homeClass = WppCore.getHomeActivityClass(loader);
+            var convFragment = XposedHelpers.findClass("com.whatsapp.ConversationFragment", loader);
+            MethodData method = dexkit.findMethod(FindMethod.create()
+                    .searchInClass(
+                            Collections.singletonList(
+                                    dexkit.getClassData(homeClass)))
+                    .matcher(MethodMatcher.create().returnType(convFragment))).singleOrNull();
+            if (method == null) throw new Exception("HomeConversationFragmentMethod not found");
+            return method.getMethodInstance(loader);
+        });
+    }
+
+    public synchronized static Field loadAntiRevokeConvFragmentField(ClassLoader loader) throws Exception {
+        return UnobfuscatorCache.getInstance().getField(loader, () -> {
+            Class<?> chatClass = findFirstClassUsingStrings(loader, StringMatchType.Contains, "conversation/createconversation");
+            Class<?> conversation = XposedHelpers.findClass("com.whatsapp.ConversationFragment", loader);
+            Field field = ReflectionUtils.getFieldByType(conversation, chatClass);
+            if (field == null) throw new Exception("AntiRevokeConvChat field not found");
+            return field;
+        });
+    }
 
     public synchronized static Field loadAntiRevokeConvChatField(ClassLoader loader) throws Exception {
         return UnobfuscatorCache.getInstance().getField(loader, () -> {