Fix bug in Hide Archive chat on WA 2.25.13.XX

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

Author: Dev4Mod

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

@@ -834,19 +834,11 @@ public synchronized static Method loadBlueOnReplayWaJobManagerMethod(ClassLoader
         });
     }
 
-    public synchronized static Method[] loadArchiveHideViewMethod(ClassLoader loader) throws Exception {
-        return UnobfuscatorCache.getInstance().getMethods(loader, () -> {
-            if (cache.containsKey("ArchiveHideView"))
-                return (Method[]) cache.get("ArchiveHideView");
-            var methods = findAllMethodUsingStrings(loader, StringMatchType.Contains, "archive/set-content-indicator-to-empty");
-            if (methods.length == 0) throw new Exception("ArchiveHideView method not found");
-            ArrayList<Method> result = new ArrayList<>();
-            for (var m : methods) {
-                result.add(m.getDeclaringClass().getMethod("setVisibility", boolean.class));
-            }
-            var resultArray = result.toArray(new Method[0]);
-            cache.put("ArchiveHideView", resultArray);
-            return resultArray;
+    public synchronized static Class loadArchiveChatClass(ClassLoader loader) throws Exception {
+        return UnobfuscatorCache.getInstance().getClass(loader, () -> {
+            var clazz = findFirstClassUsingStrings(loader, StringMatchType.Contains, "archive/set-content-indicator-to-empty");
+            if (clazz == null) throw new Exception("ArchiveHideView method not found");
+            return clazz;
         });
     }
 

app/src/main/java/com/wmods/wppenhacer/xposed/features/general/NewChat.java

@@ -1,7 +1,5 @@
 package com.wmods.wppenhacer.xposed.features.general;
 
-import static de.robv.android.xposed.XposedHelpers.findClass;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
@@ -34,6 +32,7 @@ public NewChat(@NonNull ClassLoader loader, @NonNull XSharedPreferences preferen
     public void doHook() {
         var homeActivity = WppCore.getHomeActivityClass(classLoader);
         var action = prefs.getBoolean("buttonaction", true);
+
         if (!prefs.getBoolean("newchat", true)) return;
 
         XposedHelpers.findAndHookMethod(homeActivity, "onCreateOptionsMenu", Menu.class, new XC_MethodHook() {
@@ -52,7 +51,9 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                 if (action) {
                     item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
                 }
+
                 item.setOnMenuItemClickListener(item1 -> {
+
                     var view = new LinearLayout(activity);
                     view.setGravity(Gravity.CENTER);
                     view.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));
@@ -63,6 +64,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                     edt.setTransformationMethod(null);
                     edt.setHint(ResId.string.number_with_country_code);
                     view.addView(edt);
+
                     new AlertDialogWpp(activity)
                             .setTitle(activity.getString(ResId.string.new_chat))
                             .setView(view)
@@ -76,6 +78,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                             })
                             .setNegativeButton(activity.getString(ResId.string.cancel), null)
                             .show();
+
                     return true;
                 });
             }

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

@@ -1,9 +1,12 @@
 package com.wmods.wppenhacer.xposed.features.privacy;
 
+import android.view.View;
+
 import androidx.annotation.NonNull;
 
 import com.wmods.wppenhacer.xposed.core.Feature;
 import com.wmods.wppenhacer.xposed.core.devkit.Unobfuscator;
+import com.wmods.wppenhacer.xposed.utils.ReflectionUtils;
 
 import java.util.Objects;
 
@@ -24,16 +27,25 @@ public void doHook() throws Throwable {
 
         if (!Objects.equals(prefs.getString("typearchive", "0"), "0")) {
 
-            var archiveHideViewMethod = Unobfuscator.loadArchiveHideViewMethod(classLoader);
-            for (var method : archiveHideViewMethod) {
-                logDebug(Unobfuscator.getMethodDescriptor(method));
-                XposedBridge.hookMethod(method, new XC_MethodHook() {
-                    @Override
-                    protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                        param.args[0] = false;
-                    }
-                });
-            }
+            var loadArchiveChatClass = Unobfuscator.loadArchiveChatClass(classLoader);
+
+            var setVisibilityMethod = View.class.getDeclaredMethod("setVisibility", int.class);
+            var viewField = ReflectionUtils.getFieldByType(loadArchiveChatClass, View.class);
+
+            XposedBridge.hookAllConstructors(loadArchiveChatClass, new XC_MethodHook() {
+                @Override
+                protected void afterHookedMethod(MethodHookParam param) throws Throwable {
+                    Object thiz = param.thisObject;
+                    XposedBridge.hookMethod(setVisibilityMethod, new XC_MethodHook() {
+                        @Override
+                        protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
+                            Object view = viewField.get(thiz);
+                            if (view != param.thisObject) return;
+                            param.args[0] = View.GONE;
+                        }
+                    });
+                }
+            });
 
         }
 
@@ -79,6 +91,6 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
     @NonNull
     @Override
     public String getPluginName() {
-        return "Hide Archive";
+        return "Hide Chats";
     }
 }