Refactor ReflectionUtils and related classes to improve type detection methods

Dev4Mod · Dev4Mod · commit b6da3caaafd4 · 2025-11-16T14:06:13.000-03:00
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/general/ChatLimit.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/general/ChatLimit.java
@@ -69,9 +69,9 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
 
                 @Override
                 protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                    var list = ReflectionUtils.findArrayOfType(param.args, Set.class);
+                    var list = ReflectionUtils.findInstancesOfType(param.args, Set.class);
                     if (list.isEmpty()) return;
-                    var listMessages = (Set) list.get(0).second;
+                    var listMessages = list.get(0).second;
                     var isExpired = false;
                     for (var fmessageObj : listMessages) {
                         var timestamp = fmessageTimestampMethod.getLong(fmessageObj);
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/general/Others.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/general/Others.java
@@ -481,7 +481,7 @@ private void sendAudioType(int audio_type) throws Exception {
         XposedBridge.hookMethod(sendAudioTypeMethod, new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                var results = ReflectionUtils.findArrayOfType(param.args, Integer.class);
+                var results = ReflectionUtils.findInstancesOfType(param.args, Integer.class);
                 if (results.size() < 2) {
                     log("sendAudioTypeMethod size < 2");
                     return;
@@ -578,7 +578,7 @@ private void hookProps() throws Exception {
         XposedBridge.hookMethod(methodPropsBoolean, new XC_MethodHook() {
             @Override
             protected void afterHookedMethod(MethodHookParam param) throws Throwable {
-                var list = ReflectionUtils.findArrayOfType(param.args, Integer.class);
+                var list = ReflectionUtils.findInstancesOfType(param.args, Integer.class);
                 int i = (int) list.get(0).second;
 
                 var propValue = propsBoolean.get(i);
@@ -597,7 +597,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
         XposedBridge.hookMethod(methodPropsInteger, new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                var list = ReflectionUtils.findArrayOfType(param.args, Integer.class);
+                var list = ReflectionUtils.findInstancesOfType(param.args, Integer.class);
                 int i = (int) list.get(0).second;
                 var propValue = propsInteger.get(i);
                 if (propValue == null) return;
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/media/MediaQuality.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/media/MediaQuality.java
@@ -91,7 +91,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                     boolean isHighResolution;
                     boolean isEnum = false;
                     var enumObj = ReflectionUtils.getArg(param.args, Enum.class, 0);
-                    var intParams = ReflectionUtils.findArrayOfType(param.args, Integer.class);
+                    var intParams = ReflectionUtils.findInstancesOfType(param.args, Integer.class);
                     if (enumObj != null) {
                         isEnum = true;
                         var hightResolution = Enum.valueOf((Class<Enum>) enumObj.getClass(), "RESOLUTION_1080P");
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/others/ActivityController.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/others/ActivityController.java
@@ -136,7 +136,7 @@ private static void contactController(Intent intent, Activity activity, Class<?>
         }
         Constructor constructor = ReflectionUtils.findConstructorUsingFilter(statusDistribution, constructor1 -> constructor1.getParameterCount() > 5);
         Object[] params = ReflectionUtils.initArray(constructor.getParameterTypes());
-        var lists = ReflectionUtils.findArrayOfType(constructor.getParameterTypes(), List.class);
+        var lists = ReflectionUtils.findClassesOfType(constructor.getParameterTypes(), List.class);
         params[lists.get(0).first] = listContacts;
         params[lists.get(1).first] = new ArrayList();
         if (lists.size() > 2) {
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/others/Channels.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/others/Channels.java
@@ -55,7 +55,7 @@ public void doHook() throws Throwable {
             XposedBridge.hookMethod(listUpdateItems, new XC_MethodHook() {
                 @Override
                 protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                    var results = ReflectionUtils.findArrayOfType(param.args, List.class);
+                    var results = ReflectionUtils.findInstancesOfType(param.args, List.class);
                     if (results.isEmpty()) return;
                     var list = (List<?>) results.get(0).second;
                     var arrList = new ArrayList<>(list);
@@ -67,7 +67,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
             XposedBridge.hookAllConstructors(removeChannelRecClass, new XC_MethodHook() {
                 @Override
                 protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                    var pairs = ReflectionUtils.findArrayOfType(param.args, List.class);
+                    var pairs = ReflectionUtils.findInstancesOfType(param.args, List.class);
                     for (var pair : pairs) {
                         param.args[pair.first] = new ArrayList<>();
                     }
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/features/others/ChatFilters.java b/app/src/main/java/com/wmods/wppenhacer/xposed/features/others/ChatFilters.java
@@ -27,10 +27,10 @@ public void doHook() throws Throwable {
         XposedBridge.hookAllConstructors(filterAdaperClass, new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                var list = ReflectionUtils.findArrayOfType(param.args, List.class);
+                var list = ReflectionUtils.findInstancesOfType(param.args, List.class);
                 if (!list.isEmpty()) {
                     var argResult = list.get(0);
-                    var newList = new ArrayList<Object>((List) argResult.second);
+                    var newList = new ArrayList<Object>(argResult.second);
                     newList.removeIf(item -> {
                         var name = XposedHelpers.getObjectField(item, "A01");
                         return name == null || name == "CONTACTS_FILTER" || name == "GROUP_FILTER";
diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/utils/ReflectionUtils.java b/app/src/main/java/com/wmods/wppenhacer/xposed/utils/ReflectionUtils.java
@@ -267,24 +267,37 @@ public static int findIndexOfType(Object[] args, Class<?> type) {
         return -1;
     }
 
-    public static <T> List<Pair<Integer, T>> findArrayOfType(Object[] args, Class<T> type) {
+    public static <T> List<Pair<Integer, T>> findInstancesOfType(Object[] args, Class<T> type) {
         var result = new ArrayList<Pair<Integer, T>>();
         for (int i = 0; i < args.length; i++) {
             var arg = args[i];
-            if (arg == null) continue;
-            if (arg instanceof Class clazz) {
-                if (type.isAssignableFrom(clazz)) {
-                    result.add(new Pair<>(i, type.cast(clazz)));
-                }
-                continue;
-            }
-            if (type.isAssignableFrom(arg.getClass()) || type.isInstance(arg)) {
+            if (arg == null || arg instanceof Class) continue;
+
+            if (type.isInstance(arg)) {
                 result.add(new Pair<>(i, type.cast(arg)));
             }
         }
         return result;
     }
 
+    public static <T> List<Pair<Integer, Class<? extends T>>> findClassesOfType(Class[] args, Class<T> type) {
+        var result = new ArrayList<Pair<Integer, Class<? extends T>>>();
+        for (int i = 0; i < args.length; i++) {
+            var arg = args[i];
+            if (type.isAssignableFrom(arg)) {
+                //noinspection unchecked
+                result.add(new Pair<>(i, (Class<? extends T>) arg));
+            }
+        }
+        return result;
+    }
+
+    public static <T> T getArg(Object[] args, Class<T> typeClass, int i) {
+        var list = findInstancesOfType(args, typeClass);
+        if (list.size() <= i) return null;
+        return list.get(i).second;
+    }
+
     public static boolean isCalledFromString(String contains) {
         var trace = Thread.currentThread().getStackTrace();
         var text = Arrays.toString(trace);
@@ -331,11 +344,6 @@ public synchronized static boolean isCalledFromMethod(Method method) {
         return false;
     }
 
-    public static <T> T getArg(Object[] args, Class<T> typeClass, int i) {
-        var list = findArrayOfType(args, typeClass);
-        if (list.size() <= i) return null;
-        return list.get(i).second;
-    }
 
     public static void setObjectField(Field field, Object instance, Object value) {
         try {

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ private static void contactController(Intent intent, Activity activity, Class<?>`
`136`	`136`	`}`
`137`	`137`	`Constructor constructor = ReflectionUtils.findConstructorUsingFilter(statusDistribution, constructor1 -> constructor1.getParameterCount() > 5);`
`138`	`138`	`Object[] params = ReflectionUtils.initArray(constructor.getParameterTypes());`
`139`		`- var lists = ReflectionUtils.findArrayOfType(constructor.getParameterTypes(), List.class);`
	`139`	`+ var lists = ReflectionUtils.findClassesOfType(constructor.getParameterTypes(), List.class);`
`140`	`140`	`params[lists.get(0).first] = listContacts;`
`141`	`141`	`params[lists.get(1).first] = new ArrayList();`
`142`	`142`	`if (lists.size() > 2) {`