Fix bug in change color of StatusComposer

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

Author: Dev4Mod

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

@@ -226,7 +226,7 @@ public synchronized static Field loadBroadcastTagField(ClassLoader classLoader)
         return UnobfuscatorCache.getInstance().getField(classLoader, () -> {
             var fmessage = loadFMessageClass(classLoader);
             var clazzData = dexkit.findClass(FindClass.create().matcher(ClassMatcher.create().addUsingString("UPDATE_MESSAGE_MAIN_BROADCAST_SCAN_SQL")));
-            if (clazzData.isEmpty()) return new Exception("BroadcastTag class not found");
+            if (clazzData.isEmpty()) throw new Exception("BroadcastTag class not found");
             var methodData = dexkit.findMethod(FindMethod.create().searchInClass(clazzData).matcher(MethodMatcher.create().usingStrings("participant_hash", "view_mode", "broadcast")));
             if (methodData.isEmpty()) throw new Exception("BroadcastTag method support not found");
             var usingFields = methodData.get(0).getUsingFields();
@@ -700,7 +700,7 @@ public synchronized static Field loadAntiRevokeConvChatField(ClassLoader loader)
 
     public synchronized static Field loadAntiRevokeChatJidField(ClassLoader loader) throws Exception {
         return UnobfuscatorCache.getInstance().getField(loader, () -> {
-            Class<?> chatClass = findFirstClassUsingStrings(loader, StringMatchType.Contains, "payment_chat_composer_entry_nux_shown");
+            Class<?> chatClass = findFirstClassUsingStrings(loader, StringMatchType.Contains, "conversation/createconversation");
             Class<?> jidClass = XposedHelpers.findClass("com.whatsapp.jid.Jid", loader);
             Field field = ReflectionUtils.getFieldByExtendType(chatClass, jidClass);
             if (field == null) throw new Exception("AntiRevokeChatJid field not found");
@@ -1585,22 +1585,10 @@ public synchronized static Class loadListChannelItemClass(ClassLoader classLoade
     }
 
     public synchronized static Method loadTextStatusComposer(ClassLoader classLoader) throws Exception {
-        return UnobfuscatorCache.getInstance().getMethod(classLoader, () -> {
-            var method1 = View.class.getDeclaredMethod("setBackgroundColor", int.class);
-            Class<?> TextStatusComposerFragmentClass = classLoader.loadClass("com.whatsapp.statuscomposer.composer.TextStatusComposerFragment");
-            var fieldInt = ReflectionUtils.findFieldUsingFilter(TextStatusComposerFragmentClass, field -> field.getType() == int.class);
-            var classData = dexkit.getClassData(TextStatusComposerFragmentClass);
-            if (classData == null) throw new RuntimeException("TextStatusComposer class not found");
-
-            var methods = classData.findMethod(FindMethod.create().matcher(MethodMatcher.create()
-                    .addInvoke(DexSignUtil.getMethodDescriptor(method1))
-                    .addUsingField(DexSignUtil.getFieldDescriptor(fieldInt))
-                    .modifiers(Modifier.PUBLIC | Modifier.STATIC)
-            ));
-            if (methods.isEmpty())
-                throw new RuntimeException("TextStatusComposer method not found");
-            return methods.get(methods.size() - 1).getMethodInstance(classLoader);
-        });
+        var methods = dexkit.findMethod(FindMethod.create().matcher(MethodMatcher.create().addUsingString("background_color_key", StringMatchType.Equals).paramCount(1)));
+        if (methods.isEmpty())
+            return null;
+        return methods.single().getMethodInstance(classLoader);
     }
 
     public synchronized static Method loadTextStatusComposer2(ClassLoader classLoader) throws Exception {

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

@@ -1,5 +1,6 @@
 package com.wmods.wppenhacer.xposed.features.others;
 
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.EditText;
@@ -11,6 +12,7 @@
 import com.wmods.wppenhacer.xposed.core.WppCore;
 import com.wmods.wppenhacer.xposed.core.devkit.Unobfuscator;
 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.Field;
@@ -23,6 +25,7 @@
 
 public class TextStatusComposer extends Feature {
     private static final AtomicReference<ColorData> colorData = new AtomicReference<>();
+    private static final AtomicReference<Object> textComposerModel = new AtomicReference<>();
 
     public TextStatusComposer(@NonNull ClassLoader classLoader, @NonNull XSharedPreferences preferences) {
         super(classLoader, preferences);
@@ -34,6 +37,27 @@ 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() {
+                @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);
+            XposedBridge.hookMethod(arrMethod, new XC_MethodHook() {
+                @Override
+                protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
+                    try {
+                        param.setResult(XposedBridge.invokeOriginalMethod(param.method, param.thisObject, param.args));
+                    } catch (Exception e) {
+                        param.setResult(ResId.string.app_name);
+                    }
+                }
+            });
+        }
+
         var clazz = XposedHelpers.findClass("com.whatsapp.statuscomposer.composer.TextStatusComposerFragment", classLoader);
         var methodOnCreate = ReflectionUtils.findMethodUsingFilter(clazz, method -> method.getParameterCount() == 2 && method.getParameterTypes()[0] == Bundle.class && method.getParameterTypes()[1] == View.class);
         XposedBridge.hookMethod(methodOnCreate,
@@ -49,9 +73,17 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                         pickerColor.setOnLongClickListener(v -> {
                             var dialog = new SimpleColorPickerDialog(activity, color -> {
                                 try {
-                                    Field fieldInt = ReflectionUtils.findFieldUsingFilter(param.thisObject.getClass(), field -> field.getType() == int.class);
-                                    fieldInt.setInt(param.thisObject, color);
-                                    ReflectionUtils.callMethod(setColorTextComposer, null, param.thisObject);
+                                    if (setColorTextComposer != null) {
+                                        var mInstance = textComposerModel.get();
+                                        ReflectionUtils.callMethod(setColorTextComposer, mInstance, color);
+                                    } else {
+                                        Field fieldInt = ReflectionUtils.getFieldByType(param.thisObject.getClass(), int.class);
+                                        fieldInt.setInt(param.thisObject, color);
+                                    }
+                                    activity.getWindow().setBackgroundDrawable(new ColorDrawable(color));
+                                    var controls = viewRoot.findViewById(Utils.getID("controls", "id"));
+                                    controls.setBackgroundColor(color);
+
                                 } catch (Exception e) {
                                     log(e);
                                 }