Refactor GroupAdmin feature with DexKit

Author: Dev4Mod

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

@@ -1347,11 +1347,10 @@ public synchronized static Method loadAudioProximitySensorMethod(ClassLoader loa
 
     public synchronized static Method loadGroupAdminMethod(ClassLoader loader) throws Exception {
         return UnobfuscatorCache.getInstance().getMethod(loader, () -> {
-            var method = findFirstMethodUsingStrings(loader, StringMatchType.Contains, "P Message");
-            if (method == null)
-                method = findFirstMethodUsingStrings(loader, StringMatchType.Contains, "ConversationRow/setUpUsernameInGroupViewContainer/not allowed state");
-            if (method == null) throw new RuntimeException("GroupAdmin method not found");
-            return method;
+            var method = dexkit.findMethod(FindMethod.create().matcher(MethodMatcher.create().name("setupUsernameInGroupViewContainer")));
+            if (method.isEmpty())
+                throw new RuntimeException("GroupAdmin method not found");
+            return method.get(0).getMethodInstance(loader);
         });
     }
 
@@ -1365,12 +1364,25 @@ public synchronized static Method loadJidFactory(ClassLoader loader) throws Exce
 
     public synchronized static Method loadGroupCheckAdminMethod(ClassLoader loader) throws Exception {
         return UnobfuscatorCache.getInstance().getMethod(loader, () -> {
-            var clazz = findFirstClassUsingStrings(loader, StringMatchType.Contains, "saveGroupParticipants/INSERT_GROUP_PARTICIPANT_USER");
-            var userJidClass = XposedHelpers.findClass("com.whatsapp.jid.UserJid", loader);
-            var methods = ReflectionUtils.findAllMethodsUsingFilter(clazz, m -> m.getParameterCount() == 2 && m.getParameterTypes()[1].equals(userJidClass) && m.getReturnType().equals(boolean.class));
-            if (methods == null || methods.length == 0)
+            var classData = dexkit.findClass(FindClass.create().matcher(ClassMatcher.create().addUsingString("saveGroupParticipants/INSERT_GROUP_PARTICIPANT_USER")));
+            var resultMethod = classData.findMethod(
+                    FindMethod.create().matcher(MethodMatcher.create().paramCount(2).paramTypes(null, "com.whatsapp.jid.UserJid")
+                            .opNames(List.of(
+                                    "const/4",
+                                    "invoke-static",
+                                    "const/4",
+                                    "invoke-static",
+                                    "invoke-virtual",
+                                    "move-result-object",
+                                    "const/4",
+                                    "invoke-virtual",
+                                    "move-result-object",
+                                    "if-nez"
+                            ), OpCodeMatchType.StartsWith)
+                    )).singleOrNull();
+            if (resultMethod == null)
                 throw new RuntimeException("GroupCheckAdmin method not found");
-            return methods[methods.length - 1];
+            return resultMethod.getMethodInstance(loader);
         });
     }
 

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

@@ -10,11 +10,15 @@
 
 import com.wmods.wppenhacer.xposed.core.Feature;
 import com.wmods.wppenhacer.xposed.core.WppCore;
+import com.wmods.wppenhacer.xposed.core.components.FMessageWpp;
 import com.wmods.wppenhacer.xposed.core.devkit.Unobfuscator;
+import com.wmods.wppenhacer.xposed.utils.DebugUtils;
 import com.wmods.wppenhacer.xposed.utils.ReflectionUtils;
 import com.wmods.wppenhacer.xposed.utils.ResId;
 import com.wmods.wppenhacer.xposed.utils.Utils;
 
+import java.lang.reflect.Method;
+
 import de.robv.android.xposed.XC_MethodHook;
 import de.robv.android.xposed.XSharedPreferences;
 import de.robv.android.xposed.XposedBridge;
@@ -36,20 +40,16 @@ public void doHook() throws Throwable {
             @SuppressLint("ResourceType")
             @Override
             protected void afterHookedMethod(MethodHookParam param) throws Throwable {
-                var targetObj = param.thisObject != null
-                        ? param.thisObject
-                        : param.args[1];
-
-                var fMessage = XposedHelpers.callMethod(targetObj, "getFMessage");
-                var userJidClass = XposedHelpers.findClass("com.whatsapp.jid.UserJid", classLoader);
-                var methodResult = ReflectionUtils.findMethodUsingFilter(fMessage.getClass(), method -> method.getReturnType() == userJidClass && method.getParameterCount() == 0);
-                var userJid = ReflectionUtils.callMethod(methodResult, fMessage);
+                var targetObj = param.thisObject != null ? param.thisObject : param.args[1];
+                Object fMessageObj = XposedHelpers.callMethod(targetObj, "getFMessage");
+                var fMessage = new FMessageWpp(fMessageObj);
+                var userJid = fMessage.getUserJid();
                 var chatCurrentJid = WppCore.getCurrentUserJid();
                 if (!chatCurrentJid.isGroup()) return;
                 var field = ReflectionUtils.getFieldByType(targetObj.getClass(), grpcheckAdmin.getDeclaringClass());
                 var grpParticipants = field.get(targetObj);
-                var jidGrp = jidFactory.invoke(null, chatCurrentJid.lid);
-                var result = ReflectionUtils.callMethod(grpcheckAdmin, grpParticipants, jidGrp, userJid);
+                var jidGrp = jidFactory.invoke(null, chatCurrentJid.getRawLidString());
+                var result = grpcheckAdmin.invoke(grpParticipants, jidGrp, userJid.jid);
                 var view = (View) targetObj;
                 var context = view.getContext();
                 ImageView iconAdmin;