Fix bug in text composer WA 2.25.5.72

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

Author: Dev4Mod

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

@@ -1591,19 +1591,7 @@ public synchronized static Class loadListChannelItemClass(ClassLoader classLoade
     }
 
     public synchronized static Method loadTextStatusComposer(ClassLoader classLoader) throws Exception {
-        var methods = dexkit.findMethod(FindMethod.create().matcher(MethodMatcher.create().addUsingString("background_color_key", StringMatchType.Equals)));
-        for (MethodData method : methods) {
-            var targetMethod = method.getDeclaredClass().findMethod(
-                    FindMethod.create().matcher(
-                            MethodMatcher.create().returnType(int.class).paramCount(1)
-                    )
-            );
-
-            if (!targetMethod.isEmpty()) {
-                return targetMethod.single().getMethodInstance(classLoader);
-            }
-        }
-        return null;
+        return findFirstMethodUsingStrings(classLoader, StringMatchType.Contains, "Can't put value with type");
     }
 
     public synchronized static Method loadTextStatusComposer2(ClassLoader classLoader) throws Exception {
@@ -1814,11 +1802,18 @@ public static Class<?> loadFragmentClass(ClassLoader classLoader) throws Excepti
 
     public static Method loadMediaQualitySelectionMethod(ClassLoader classLoader) throws Exception {
         return UnobfuscatorCache.getInstance().getMethod(classLoader, () -> {
-            var classData = dexkit.getClassData("com.whatsapp.mediacomposer.MediaComposerActivity");
-            var methodData = Objects.requireNonNull(classData).findMethod(FindMethod.create().matcher(
-                    MethodMatcher.create().addUsingNumber(6033).
+            var methodData = dexkit.findMethod(FindMethod.create().matcher(
+                    MethodMatcher.create().addUsingString("enable_media_quality_tool").
                             returnType(boolean.class)
             ));
+
+            if (methodData.isEmpty()) {
+                methodData = dexkit.findMethod(FindMethod.create().matcher(
+                        MethodMatcher.create().addUsingString("show_media_quality_toggle").
+                                returnType(boolean.class)
+                ));
+            }
+
             if (methodData.isEmpty())
                 throw new RuntimeException("MediaQualitySelection method not found");
             return methodData.single().getMethodInstance(classLoader);

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

@@ -38,14 +38,16 @@ public void doHook() throws Throwable {
         var setColorTextComposer = Unobfuscator.loadTextStatusComposer(classLoader);
         log("setColorTextComposer: " + Unobfuscator.getMethodDescriptor(setColorTextComposer));
 
-        if (setColorTextComposer != null) {
-            XposedBridge.hookAllConstructors(setColorTextComposer.getDeclaringClass(), new XC_MethodHook() {
+        var textModelClass = XposedHelpers.findClassIfExists("com.whatsapp.statuscomposer.composer.TextStatusComposerViewModel", classLoader);
+
+        if (textModelClass != null) {
+            XposedBridge.hookAllConstructors(textModelClass, new XC_MethodHook() {
                 @Override
                 protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                     textComposerModel.set(param.thisObject);
                 }
             });
-            var arrMethod = ReflectionUtils.findMethodUsingFilter(setColorTextComposer.getDeclaringClass(), method -> method.getParameterCount() == 1 && method.getParameterTypes()[0] == int.class && method.getReturnType() == int.class);
+            var arrMethod = ReflectionUtils.findMethodUsingFilter(textModelClass, method -> method.getParameterCount() == 1 && method.getParameterTypes()[0] == int.class && method.getReturnType() == int.class);
             XposedBridge.hookMethod(arrMethod, new XC_MethodHook() {
                 @Override
                 protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
@@ -73,9 +75,11 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                         pickerColor.setOnLongClickListener(v -> {
                             var dialog = new SimpleColorPickerDialog(activity, color -> {
                                 try {
-                                    if (setColorTextComposer != null) {
-                                        var mInstance = textComposerModel.get();
-                                        ReflectionUtils.callMethod(setColorTextComposer, mInstance, color);
+                                    if (textModelClass != null) {
+                                        var textModel = textComposerModel.get();
+                                        var mField = ReflectionUtils.getFieldsByType(textModel.getClass(), setColorTextComposer.getDeclaringClass()).get(0);
+                                        var auxInstance = ReflectionUtils.getObjectField(mField, textModel);
+                                        ReflectionUtils.callMethod(setColorTextComposer, auxInstance, "background_color_key", color);
                                     } else {
                                         Field fieldInt = ReflectionUtils.getFieldByType(param.thisObject.getClass(), int.class);
                                         fieldInt.setInt(param.thisObject, color);