fix bug in privacy seen and receipt

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

Author: Dev4Mod

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

@@ -21,24 +21,34 @@ public HideReceipt(ClassLoader loader, XSharedPreferences preferences) {
     public void doHook() throws Exception {
         var hideReceipt = prefs.getBoolean("hidereceipt", false);
         var ghostmode = WppCore.getPrivBoolean("ghostmode", false);
+        var hideread = prefs.getBoolean("hideread", false);
+
         var method = Unobfuscator.loadReceiptMethod(classLoader);
         logDebug("hook method:" + Unobfuscator.getMethodDescriptor(method));
         var method2 = Unobfuscator.loadReceiptOutsideChat(classLoader);
         logDebug("Outside Chat: " + Unobfuscator.getMethodDescriptor(method2));
-        var method3 = Unobfuscator.loadReceiptInChat(classLoader);
-        logDebug("In Chat: " + Unobfuscator.getMethodDescriptor(method3));
+        var mInChat = Unobfuscator.loadReceiptInChat(classLoader);
+        logDebug("In Chat: " + Unobfuscator.getMethodDescriptor(mInChat));
+
         XposedBridge.hookMethod(method, new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                if (!ReflectionUtils.isCalledFromMethod(method2) && !ReflectionUtils.isCalledFromMethod(method3))
+                if (!ReflectionUtils.isCalledFromMethod(method2) && !ReflectionUtils.isCalledFromMethod(mInChat))
                     return;
+                logDebug("HideReceipt 1:" + ReflectionUtils.isCalledFromMethod(method2));
+                logDebug("HideReceipt 2:" + ReflectionUtils.isCalledFromMethod(mInChat));
                 var messageKey = new FMessageWpp.Key(param.args[3]);
                 var userJid = messageKey.remoteJid;
                 var rawJid = WppCore.getRawString(userJid);
                 var number = WppCore.stripJID(rawJid);
                 var privacy = CustomPrivacy.getJSON(number);
                 var customHideReceipt = privacy.optBoolean("HideReceipt", hideReceipt);
+                var customHideRead = privacy.optBoolean("HideSeen", hideread);
                 if (param.args[4] != "sender" && (customHideReceipt || ghostmode)) {
+                    if (!ReflectionUtils.isCalledFromMethod(method2) && ReflectionUtils.isCalledFromMethod(mInChat) && !customHideRead) {
+                        log("Called from In Chat");
+                        return;
+                    }
                     param.args[4] = "inactive";
                 }
             }

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

@@ -10,6 +10,7 @@
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
+import java.util.Objects;
 import java.util.Set;
 
 import de.robv.android.xposed.XC_MethodHook;
@@ -53,6 +54,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                 if (jid == null) return;
                 var number = WppCore.stripJID(jid);
                 var privacy = CustomPrivacy.getJSON(number);
+
                 var customHideRead = privacy.optBoolean("HideSeen", hideread);
 
                 if (WppCore.isGroup(jid)) {
@@ -78,16 +80,20 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
         Method hideViewMethod = Unobfuscator.loadHideViewMethod(classLoader);
         logDebug(Unobfuscator.getMethodDescriptor(hideViewMethod));
 
+        var method3 = Unobfuscator.loadReceiptOutsideChat(classLoader);
+        logDebug("Outside Chat: " + Unobfuscator.getMethodDescriptor(method3));
+
+
         XposedBridge.hookMethod(hideViewMethod, new XC_MethodHook() {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                if (!ReflectionUtils.isCalledFromMethod(hideViewInChatMethod)) return;
-                if (param.args[4] == null || !param.args[4].equals("read")) return;
+                if (ReflectionUtils.isCalledFromMethod(method3) || !ReflectionUtils.isCalledFromMethod(hideViewInChatMethod))
+                    return;
+                if (!Objects.equals("read", param.args[4])) return;
                 var jid = WppCore.getCurrentRawJID();
                 var number = WppCore.stripJID(jid);
                 var privacy = CustomPrivacy.getJSON(number);
                 var customHideRead = privacy.optBoolean("HideSeen", hideread);
-
                 if (WppCore.isGroup(jid)) {
                     if (privacy.optBoolean("HideSeen", hideread_group))
                         param.args[4] = null;