Fix: Custom Privacy not working

Author: Dev4Mod

app/src/main/java/com/wmods/wppenhacer/xposed/core/WppCore.java

@@ -376,7 +376,9 @@ public static Object getFMessageFromKey(Object messageKey) {
     }
 
 
-    public static Object createUserJid(String rawjid) {
+    @Nullable
+    public static Object createUserJid(@Nullable String rawjid) {
+        if (rawjid == null) return null;
         var genInstance = XposedHelpers.newInstance(mGenJidClass);
         try {
             return mGenJidMethod.invoke(genInstance, rawjid);

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

@@ -106,7 +106,7 @@ public String getPluginName() {
         return "Toast Viewer";
     }
 
-    private synchronized void checkDataBase(SQLiteDatabase sql, long id, String contactName, String raw, boolean toastViewedMessage, boolean toast_viewed_status) {
+    private synchronized void checkDataBase(SQLiteDatabase sql, long id, String contactName, String rawJid, boolean toastViewedMessage, boolean toast_viewed_status) {
         try (var result2 = sql.query("message", null, "_id = ?", new String[]{String.valueOf(id)}, null, null, null)) {
             if (!result2.moveToNext()) return;
 
@@ -115,25 +115,32 @@ private synchronized void checkDataBase(SQLiteDatabase sql, long id, String cont
                 if (toast_viewed_status) {
                     Utils.showToast(Utils.getApplication().getString(ResId.string.viewed_your_status, contactName), Toast.LENGTH_LONG);
                 }
-                Tasker.sendTaskerEvent(contactName, WppCore.stripJID(raw), "viewed_status");
+                Tasker.sendTaskerEvent(contactName, WppCore.stripJID(rawJid), "viewed_status");
                 return;
             }
 
-            if (Objects.equals(WppCore.getCurrentRawJID(), raw)) return;
+            if (Objects.equals(WppCore.getCurrentRawJID(), rawJid)) return;
 
             var chat_id = result2.getLong(result2.getColumnIndexOrThrow("chat_row_id"));
             try (var result3 = sql.query("chat", null, "_id = ? AND subject IS NULL", new String[]{String.valueOf(chat_id)}, null, null, null)) {
                 if (!result3.moveToNext()) return;
 
-                var key = raw + "_" + "viewed_message";
+                var key = rawJid + "_" + "viewed_message";
                 long currentTime = System.currentTimeMillis();
                 Long lastEventTime = lastEventTimeMap.get(key);
                 if (lastEventTime == null || (currentTime - lastEventTime) >= MIN_INTERVAL) {
                     lastEventTimeMap.put(key, currentTime);
+                    Tasker.sendTaskerEvent(contactName, WppCore.stripJID(rawJid), "viewed_message");
                     if (toastViewedMessage) {
+                        XposedBridge.log("Call Jid");
+                        var userJid = WppCore.createUserJid(WppCore.getCurrentRawJID());
+                        var jid = WppCore.resolveJidFromLid(userJid);
+                        var rawCurJid = WppCore.getRawString(jid);
+                        if (Objects.equals(rawCurJid, rawJid)) {
+                            return;
+                        }
                         Utils.showToast(Utils.getApplication().getString(ResId.string.viewed_your_message, contactName), Toast.LENGTH_LONG);
                     }
-                    Tasker.sendTaskerEvent(contactName, WppCore.stripJID(raw), "viewed_message");
                 }
             }
         }

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

@@ -41,7 +41,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                     return;
                 var key = ReflectionUtils.getArg(param.args, FMessageWpp.Key.TYPE, 0);
                 var messageKey = new FMessageWpp.Key(key);
-                var userJid = messageKey.remoteJid;
+                var userJid = WppCore.resolveJidFromLid(messageKey.remoteJid);
                 var rawJid = WppCore.getRawString(userJid);
                 var number = WppCore.stripJID(rawJid);
                 var privacy = CustomPrivacy.getJSON(number);

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

@@ -51,7 +51,9 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                     WppCore.removePrivKey(firstmessage + "_rpass");
                     return;
                 }
-                var jid = (String) XposedHelpers.getObjectField(srj, "jid");
+                var lid = (String) XposedHelpers.getObjectField(srj, "jid");
+                var ojid = WppCore.createUserJid(lid);
+                var jid = WppCore.getRawString(WppCore.resolveJidFromLid(ojid));
                 if (jid == null) return;
                 var number = WppCore.stripJID(jid);
                 var privacy = CustomPrivacy.getJSON(number);
@@ -108,7 +110,9 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                     return;
                 var msgTypeIdx = ReflectionUtils.findIndexOfType(((Method) param.method).getParameterTypes(), String.class);
                 if (!Objects.equals("read", param.args[msgTypeIdx])) return;
-                var jid = WppCore.getCurrentRawJID();
+                var lid = WppCore.getCurrentRawJID();
+                var ojid = WppCore.createUserJid(lid);
+                var jid = WppCore.getRawString(WppCore.resolveJidFromLid(ojid));
                 var number = WppCore.stripJID(jid);
                 var privacy = CustomPrivacy.getJSON(number);
                 var customHideRead = privacy.optBoolean("HideSeen", hideread);

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

@@ -29,7 +29,7 @@ public void doHook() throws Throwable {
             @Override
             protected void beforeHookedMethod(MethodHookParam param) {
                 var p1 = (int) param.args[2];
-                var userJid = param.args[1];
+                var userJid = WppCore.resolveJidFromLid(param.args[1]);
                 var number = WppCore.stripJID(WppCore.getRawString(userJid));
                 var privacy = CustomPrivacy.getJSON(number);
                 var customHideTyping = privacy.optBoolean("HideTyping", ghostmode_t);