Refactor TagMessage to use AntiRevokeBubbleMethod

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

Author: Dev4Mod

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

@@ -14,7 +14,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -56,7 +55,6 @@
 import java.util.TimerTask;
 import java.util.stream.Collectors;
 
-import de.robv.android.xposed.XposedBridge;
 import de.robv.android.xposed.XposedHelpers;
 
 public class Unobfuscator {
@@ -301,31 +299,6 @@ 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);
-        });
-    }
-
     public synchronized static Class<?> loadForwardClassMethod(ClassLoader classLoader) throws Exception {
         return UnobfuscatorCache.getInstance().getClass(classLoader, () -> findFirstClassUsingStrings(classLoader, StringMatchType.Contains, "UserActions/userActionForwardMessage"));
     }

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

@@ -3,22 +3,22 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
 import com.wmods.wppenhacer.xposed.core.Feature;
 import com.wmods.wppenhacer.xposed.core.components.FMessageWpp;
 import com.wmods.wppenhacer.xposed.core.devkit.Unobfuscator;
+import com.wmods.wppenhacer.xposed.utils.DesignUtils;
 import com.wmods.wppenhacer.xposed.utils.ReflectionUtils;
 import com.wmods.wppenhacer.xposed.utils.Utils;
 
 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) {
@@ -52,43 +52,31 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
     }
 
     private void hookBroadcastView() throws Exception {
-        Method method1 = Unobfuscator.loadBroadcastTagMethod(classLoader);
 
-        XposedBridge.hookMethod(method1, new XC_MethodHook() {
-            private FMessageWpp.Key keyObj;
-            private Unhook hooked;
+        var bubbleMethod = Unobfuscator.loadAntiRevokeBubbleMethod(classLoader);
+        logDebug(Unobfuscator.getMethodDescriptor(bubbleMethod));
 
+        XposedBridge.hookMethod(bubbleMethod, new XC_MethodHook() {
             @Override
-            protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                keyObj = null;
-                var fmessageObj = ReflectionUtils.getArg(param.args, FMessageWpp.TYPE, 0);
-                var fmessage = new FMessageWpp(fmessageObj);
+            protected void afterHookedMethod(MethodHookParam param) {
+                var objMessage = param.args[2];
+                var dateTextView = (TextView) param.args[1];
+                if (dateTextView == null) return;
+                var fmessage = new FMessageWpp(objMessage);
                 var key = fmessage.getKey();
-                if (!key.isFromMe && fmessage.isBroadcast()) {
-                    var view = (ViewGroup) (param.thisObject instanceof ViewGroup ? param.thisObject : param.args[0]);
-                    int id = Utils.getID("broadcast_icon", "id");
-                    View res = view.findViewById(id);
-                    if (res == null) {
-                        var dateWrapper = (ViewGroup) view.findViewById(Utils.getID("date_wrapper", "id"));
-                        var broadcast = new ImageView(view.getContext());
+                var dateWrapper = (ViewGroup) dateTextView.getParent();
+                int id = Utils.getID("broadcast_icon", "id");
+                View res = dateWrapper.findViewById(id);
+                if (!key.isFromMe)
+                    if (fmessage.isBroadcast() && res == null) {
+                        var broadcast = new ImageView(dateWrapper.getContext());
                         broadcast.setId(id);
+                        broadcast.setImageDrawable(DesignUtils.getDrawableByName("broadcast_status_icon"));
                         dateWrapper.addView(broadcast, 0);
+                    } else if (res != null) {
+                        dateWrapper.removeView(res);
                     }
-                    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();
-                }
-            }
-
         });
     }