Refactor LID/JID conversion and improve seen hiding

Author: Dev4Mod

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

@@ -133,24 +133,26 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
 
     }
 
-    public static Object resolveJidFromLid(Object lid) {
+    public static Object convertLidToJid(Object lid) {
         if (lid == null) return null;
         try {
             var rawString = (String) XposedHelpers.callMethod(lid, "getRawString");
             if (rawString == null || !rawString.contains("@lid")) return lid;
-            return ReflectionUtils.callMethod(convertLidToJid, mWaJidMapRepository, lid);
+            var result = ReflectionUtils.callMethod(convertLidToJid, mWaJidMapRepository, lid);
+            return result == null ? lid : result;
         } catch (Exception e) {
             XposedBridge.log(e);
         }
         return lid;
     }
 
-    public static Object resolveLidFromJid(Object userJid) {
+    public static Object convertJidToLid(Object userJid) {
         if (userJid == null) return null;
         try {
             var rawString = (String) XposedHelpers.callMethod(userJid, "getRawString");
             if (rawString == null || rawString.contains("@lid")) return userJid;
-            return ReflectionUtils.callMethod(convertJidToLid, mWaJidMapRepository, userJid);
+            var result = ReflectionUtils.callMethod(convertJidToLid, mWaJidMapRepository, userJid);
+            return result == null ? userJid : result;
         } catch (Exception e) {
             XposedBridge.log(e);
         }

app/src/main/java/com/wmods/wppenhacer/xposed/core/components/FMessageWpp.java

@@ -247,21 +247,21 @@ public UserJid(@Nullable String rawjid) {
             if (rawjid == null) return;
             if (checkValidLID(rawjid)) {
                 this.lid = WppCore.createUserJid(rawjid);
-                this.jid = WppCore.resolveJidFromLid(this.lid);
+                this.jid = WppCore.convertLidToJid(this.lid);
             } else {
                 this.jid = WppCore.createUserJid(rawjid);
-                this.lid = WppCore.resolveLidFromJid(this.jid);
+                this.lid = WppCore.convertJidToLid(this.jid);
             }
         }
 
         public UserJid(@Nullable Object lidOrJid) {
             if (lidOrJid == null) return;
             if (checkValidLID((String) XposedHelpers.callMethod(lidOrJid, "getRawString"))) {
                 this.lid = lidOrJid;
-                this.jid = WppCore.resolveJidFromLid(this.lid);
+                this.jid = WppCore.convertLidToJid(this.lid);
             } else {
                 this.jid = lidOrJid;
-                this.lid = WppCore.resolveLidFromJid(this.jid);
+                this.lid = WppCore.convertJidToLid(this.jid);
             }
         }
 
@@ -318,11 +318,11 @@ public boolean isGroup() {
 
 
         public boolean isNull() {
-            return this.jid == null || this.lid == null;
+            return this.jid == null && this.lid == null;
         }
 
-        private static boolean checkValidLID(@NonNull String lid) {
-            if (lid.contains("@lid")) {
+        private static boolean checkValidLID(String lid) {
+            if (lid != null && lid.contains("@lid")) {
                 String id = lid.split("@")[0];
                 return lid.length() > 14;
             }

app/src/main/java/com/wmods/wppenhacer/xposed/core/db/MessageHistory.java

@@ -11,13 +11,11 @@
 
 import com.wmods.wppenhacer.xposed.core.WppCore;
 import com.wmods.wppenhacer.xposed.core.components.FMessageWpp;
-import com.wmods.wppenhacer.xposed.utils.DebugUtils;
 import com.wmods.wppenhacer.xposed.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import de.robv.android.xposed.XposedBridge;
 import de.robv.android.xposed.XposedHelpers;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -244,7 +242,7 @@ public static class MessageSeenItem {
         public FMessageWpp getFMessage() {
             if (fMessageWpp == null) {
                 try {
-                    var userJid = WppCore.resolveLidFromJid(WppCore.createUserJid(jid));
+                    var userJid = WppCore.convertJidToLid(WppCore.createUserJid(jid));
                     if (userJid == null) return null;
                     var key = XposedHelpers.newInstance(FMessageWpp.Key.TYPE, userJid, message, false);
                     var fmessageObj = WppCore.getFMessageFromKey(key);

app/src/main/java/com/wmods/wppenhacer/xposed/features/customization/ShowOnline.java

@@ -174,7 +174,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                 var jidFiled = ReflectionUtils.getFieldByExtendType(object.getClass(), XposedHelpers.findClass("com.whatsapp.jid.Jid", classLoader));
                 var jidObject = jidFiled.get(object);
                 var userJid = new FMessageWpp.UserJid(jidObject);
-                if (userJid.isGroup()) return;
+                if (userJid.isGroup() || userJid.isNull()) return;
 
                 var tokenDBInstance = fieldTokenDBInstance.get(mInstancePresence);
                 var tokenData = ReflectionUtils.callMethod(tcTokenMethod, tokenDBInstance, jidObject);