Refactor TagMessage and DeleteStatus, update supported versions

Dev4Mod · Dev4Mod · commit f10464a0e373 · 2025-08-26T08:28:05.000-03:00
- Improve class resolver for `StatusDeleteDialogFragment` in DeleteStatus.
- Refactor TagMessage to correctly identify the view and prevent NPEs.
- Update supported versions for WhatsApp and WhatsApp Business to 2.25.24.xx.
- Add `findFirstClassUsingName` method to Unobfuscator.
- Improve `loadBroadcastTagMethod` in Unobfuscator to find methods using additional criteria.

Signed-off-by: Dev4Mod &lt;wellingtonmods@gmail.com&gt;
diff --git a/app/src/main/java/com/wmods/wppenhacer/App.java b/app/src/main/java/com/wmods/wppenhacer/App.java
@@ -57,6 +57,7 @@ public void onCreate() {
         var mode = Integer.parseInt(sharedPreferences.getString("thememode", "0"));
         setThemeMode(mode);
         changeLanguage(this);
+        // criar um banco de dados
     }
 
     public static void setThemeMode(int mode) {
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java b/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java
@@ -14,6 +14,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -55,6 +56,7 @@
 import java.util.TimerTask;
 import java.util.stream.Collectors;
 
+import de.robv.android.xposed.XposedBridge;
 import de.robv.android.xposed.XposedHelpers;
 
 public class Unobfuscator {
@@ -125,6 +127,7 @@ public synchronized static Class<?> findFirstClassUsingStrings(ClassLoader class
         return result.get(0).getInstance(classLoader);
     }
 
+
     public synchronized static Class<?>[] findAllClassUsingStrings(ClassLoader classLoader, StringMatchType type, String... strings) throws Exception {
         var matcher = new ClassMatcher();
         for (String string : strings) {
@@ -135,6 +138,7 @@ public synchronized static Class<?>[] findAllClassUsingStrings(ClassLoader class
         return result.stream().map(classData -> convertRealClass(classData, classLoader)).filter(Objects::nonNull).toArray(Class[]::new);
     }
 
+
     public synchronized static Class<?> findFirstClassUsingStringsFilter(ClassLoader classLoader, String packageFilter, StringMatchType type, String... strings) throws Exception {
         var matcher = new ClassMatcher();
         for (String string : strings) {
@@ -145,6 +149,12 @@ public synchronized static Class<?> findFirstClassUsingStringsFilter(ClassLoader
         return result.get(0).getInstance(classLoader);
     }
 
+    public synchronized static Class<?> findFirstClassUsingName(ClassLoader classLoader, StringMatchType type, String name) throws Exception {
+        var result = dexkit.findClass(FindClass.create().matcher(ClassMatcher.create().className(name, type)));
+        if (result.isEmpty()) return null;
+        return result.get(0).getInstance(classLoader);
+    }
+
     public synchronized static String getMethodDescriptor(Method method) {
         if (method == null) return null;
         return method.getDeclaringClass().getName() + "->" + method.getName() + "(" + Arrays.stream(method.getParameterTypes()).map(Class::getName).collect(Collectors.joining(",")) + ")";
@@ -285,10 +295,22 @@ public synchronized static Field loadBroadcastTagField(ClassLoader classLoader)
     public synchronized static Method loadBroadcastTagMethod(ClassLoader classLoader) throws Exception {
         return UnobfuscatorCache.getInstance().getMethod(classLoader, () -> {
             var field = loadBroadcastTagField(classLoader);
+            XposedBridge.log(DexSignUtil.getFieldDescriptor(field));
             var clazzData = dexkit.findClass(FindClass.create().matcher(ClassMatcher.create().addUsingString("ConversationRow/setUpUserNameInGroupView")));
             if (clazzData.isEmpty())
                 throw new Exception("BroadcastTag: ConversationRow Class not found");
             var method = dexkit.findMethod(FindMethod.create().searchInClass(clazzData).matcher(MethodMatcher.create().addUsingField(DexSignUtil.getFieldDescriptor(field))));
+            if (method.isEmpty()) {
+                var findViewId = View.class.getDeclaredMethod("findViewById", int.class);
+                var setImageResource = ImageView.class.getDeclaredMethod("setImageResource", int.class);
+                method = dexkit.findMethod(
+                        FindMethod.create().matcher(
+                                MethodMatcher.create().addUsingField(DexSignUtil.getFieldDescriptor(field))
+                                        .addInvoke(DexSignUtil.getMethodDescriptor(findViewId))
+                                        .addInvoke(DexSignUtil.getMethodDescriptor(setImageResource))
+                        )
+                );
+            }
             if (method.isEmpty())
                 throw new Exception("BroadcastTag: ConversationRow Method not found");
             return method.get(0).getMethodInstance(classLoader);
@@ -317,7 +339,8 @@ public synchronized static Method loadHideViewSendReadJob(ClassLoader classLoade
     public synchronized static Method loadHideViewInChatMethod(ClassLoader classLoader) throws Exception {
         return UnobfuscatorCache.getInstance().getMethod(classLoader, () -> {
             Method method = findFirstMethodUsingStrings(classLoader, StringMatchType.Contains, "ReadReceipts/acknowledgeMessageIfNeeded");
-            if (method == null) method = findFirstMethodUsingStrings(classLoader, StringMatchType.Contains, "ReadReceipts/sendDeliveryReceiptIfNotRetry");
+            if (method == null)
+                method = findFirstMethodUsingStrings(classLoader, StringMatchType.Contains, "ReadReceipts/sendDeliveryReceiptIfNotRetry");
             if (method == null) throw new Exception("HideViewInChat method not found");
             return method;
         });
@@ -1399,7 +1422,8 @@ public synchronized static Constructor loadStartPrefsConfig(ClassLoader loader)
 
     public synchronized static Method loadCheckOnlineMethod(ClassLoader loader) throws Exception {
         var method = findFirstMethodUsingStrings(loader, StringMatchType.Contains, "MessageHandler/handleConnectionThreadReady connectionready");
-        if (method == null) method = findFirstMethodUsingStrings(loader, StringMatchType.Contains, "app/xmpp/recv/handle_available");
+        if (method == null)
+            method = findFirstMethodUsingStrings(loader, StringMatchType.Contains, "app/xmpp/recv/handle_available");
         if (method == null) throw new RuntimeException("CheckOnline method not found");
         return method;
     }
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/general/DeleteStatus.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/general/DeleteStatus.java
@@ -15,6 +15,8 @@
 import com.wmods.wppenhacer.xposed.utils.ReflectionUtils;
 import com.wmods.wppenhacer.xposed.utils.ResId;
 
+import org.luckypray.dexkit.query.enums.StringMatchType;
+
 import java.lang.reflect.Field;
 
 import de.robv.android.xposed.XSharedPreferences;
@@ -31,7 +33,7 @@ public void doHook() throws Throwable {
 
         var fragmentloader = Unobfuscator.loadFragmentLoader(classLoader);
         var showDialogStatus = Unobfuscator.loadShowDialogStatusMethod(classLoader);
-        Class<?> StatusDeleteDialogFragmentClass = classLoader.loadClass("com.whatsapp.status.StatusDeleteDialogFragment");
+        Class<?> StatusDeleteDialogFragmentClass = Unobfuscator.findFirstClassUsingName(classLoader, StringMatchType.EndsWith, "StatusDeleteDialogFragment");
         Field fieldBundle = ReflectionUtils.getFieldByType(fragmentloader, Bundle.class);
 
         var item = new MenuStatus.MenuItemStatus() {
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/privacy/TagMessage.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/privacy/TagMessage.java
@@ -14,8 +14,10 @@
 import java.lang.reflect.Method;
 
 import de.robv.android.xposed.XC_MethodHook;
+import de.robv.android.xposed.XC_MethodReplacement;
 import de.robv.android.xposed.XSharedPreferences;
 import de.robv.android.xposed.XposedBridge;
+import de.robv.android.xposed.XposedHelpers;
 
 public class TagMessage extends Feature {
     public TagMessage(ClassLoader loader, XSharedPreferences preferences) {
@@ -53,30 +55,37 @@ private void hookBroadcastView() throws Exception {
 
         XposedBridge.hookMethod(method1, new XC_MethodHook() {
             private FMessageWpp.Key keyObj;
+            private Unhook hooked;
 
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                 keyObj = null;
-                var fmessage = new FMessageWpp(param.args[0]);
+                var fmessageObj = ReflectionUtils.getArg(param.args, FMessageWpp.TYPE, 0);
+                var fmessage = new FMessageWpp(fmessageObj);
                 var key = fmessage.getKey();
                 if (!key.isFromMe && fmessage.isBroadcast()) {
-                    var view = (ViewGroup) param.thisObject;
-                    var res = view.findViewById((int) param.args[1]);
+                    var id = ReflectionUtils.getArg(param.args, Integer.class, 0);
+                    var view = (ViewGroup) (param.thisObject instanceof ViewGroup ? param.thisObject : param.args[0]);
+                    var res = view.findViewById(id);
                     if (res == null) {
                         var dateWrapper = (ViewGroup) view.findViewById(Utils.getID("date_wrapper", "id"));
                         var broadcast = new ImageView(view.getContext());
-                        broadcast.setId((int) param.args[1]);
+                        broadcast.setId(id);
                         dateWrapper.addView(broadcast, 0);
                     }
                     key.setIsFromMe(true);
                     keyObj = key;
+                    hooked = XposedHelpers.findAndHookMethod(key.remoteJid.getClass(), "getType", XC_MethodReplacement.returnConstant(0));
                 }
             }
 
             protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                 if (keyObj != null) {
                     keyObj.setIsFromMe(false);
                 }
+                if (hooked != null) {
+                    hooked.unhook();
+                }
             }
 
         });
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -123,12 +123,18 @@
         <item>2.25.19.xx</item>
         <item>2.25.20.xx</item>
         <item>2.25.21.xx</item>
+        <item>2.25.22.xx</item>
+        <item>2.25.23.xx</item>
+        <item>2.25.24.xx</item>
     </string-array>
     <string-array name="supported_versions_business">
         <item>2.25.18.xx</item>
         <item>2.25.19.xx</item>
         <item>2.25.20.xx</item>
         <item>2.25.21.xx</item>
+        <item>2.25.22.xx</item>
+        <item>2.25.23.xx</item>
+        <item>2.25.24.xx</item>
     </string-array>
     <string-array name="image_picker">
         <item>image/*</item>

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ public void onCreate() {`
`57`	`57`	`var mode = Integer.parseInt(sharedPreferences.getString("thememode", "0"));`
`58`	`58`	`setThemeMode(mode);`
`59`	`59`	`changeLanguage(this);`
	`60`	`+ // criar um banco de dados`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`public static void setThemeMode(int mode) {`