refactor: Improve UserJid to handle both LID and JID

This commit refactors the `UserJid` class to correctly handle both LID (Lid-based JID) and standard JID inputs. The constructor now differentiates between the two formats, ensuring the correct `lid` and `jid` objects are resolved.

The `isPresent()` method has been replaced with `isNull()` for better clarity, and the changes have been propagated across the codebase to adapt to the new logic.

Author: Dev4Mod

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

@@ -30,7 +30,6 @@
 
 import java.io.File;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
@@ -353,7 +352,7 @@ public static int getDefaultTheme() {
     @NonNull
     public static String getContactName(FMessageWpp.UserJid userJid) {
         loadWADatabase();
-        if (mWaDatabase == null || !userJid.isPresent()) return "";
+        if (mWaDatabase == null || userJid.isNull()) return "";
         String name = getSContactName(userJid, false);
         if (!TextUtils.isEmpty(name)) return name;
         return getWppContactName(userJid);
@@ -382,7 +381,7 @@ public static String getSContactName(FMessageWpp.UserJid userJid, boolean saveOn
     @NonNull
     public static String getWppContactName(FMessageWpp.UserJid userJid) {
         loadWADatabase();
-        if (mWaDatabase == null || !userJid.isPresent()) return "";
+        if (mWaDatabase == null || userJid.isNull()) return "";
         String name = null;
         var rawJid = userJid.getRawString();
         var cursor2 = mWaDatabase.query("wa_vnames", new String[]{"verified_name"}, "jid = ?", new String[]{rawJid}, null, null, null);

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

@@ -243,19 +243,26 @@ public static class UserJid {
 
         public Object lid;
 
-        public UserJid(@Nullable Object lid, @Nullable Object jid) {
-            this.lid = lid;
-            this.jid = jid;
-        }
-
         public UserJid(@Nullable String rawjid) {
-            this.lid = WppCore.createUserJid(rawjid);
-            this.jid = WppCore.resolveJidFromLid(this.lid);
+            if (rawjid == null) return;
+            if (checkValidLID(rawjid)) {
+                this.lid = WppCore.createUserJid(rawjid);
+                this.jid = WppCore.resolveJidFromLid(this.lid);
+            } else {
+                this.jid = WppCore.createUserJid(rawjid);
+                this.lid = WppCore.resolveLidFromJid(this.jid);
+            }
         }
 
-        public UserJid(@Nullable Object lid) {
-            this.lid = lid;
-            this.jid = WppCore.resolveJidFromLid(lid);
+        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);
+            } else {
+                this.jid = lidOrJid;
+                this.lid = WppCore.resolveLidFromJid(this.jid);
+            }
         }
 
         @Nullable
@@ -310,8 +317,16 @@ public boolean isGroup() {
         }
 
 
-        public boolean isPresent() {
-            return this.jid != null && this.lid != null;
+        public boolean isNull() {
+            return this.jid == null || this.lid == null;
+        }
+
+        private static boolean checkValidLID(@NonNull String lid) {
+            if (lid.contains("@lid")) {
+                String id = lid.split("@")[0];
+                return lid.length() > 14;
+            }
+            return false;
         }
 
         @NonNull

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

@@ -19,7 +19,6 @@
 
 import java.lang.reflect.Field;
 import java.text.DateFormat;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -242,7 +241,7 @@ private void showToast(FMessageWpp fMessage) {
             name = jidAuthor.getStripJID();
         }
         String message;
-        if (jidAuthor.isGroup() && !fMessage.getUserJid().isPresent()) {
+        if (jidAuthor.isGroup() && fMessage.getUserJid().isNull()) {
             var participantJid = fMessage.getUserJid();
             String participantName = WppCore.getContactName(participantJid);
             if (TextUtils.isEmpty(participantName)) {

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

@@ -22,7 +22,6 @@
 import com.wmods.wppenhacer.xposed.core.WppCore;
 import com.wmods.wppenhacer.xposed.core.components.AlertDialogWpp;
 import com.wmods.wppenhacer.xposed.core.components.FMessageWpp;
-import com.wmods.wppenhacer.xposed.core.devkit.Unobfuscator;
 import com.wmods.wppenhacer.xposed.features.others.MenuHome;
 import com.wmods.wppenhacer.xposed.utils.DesignUtils;
 import com.wmods.wppenhacer.xposed.utils.ReflectionUtils;
@@ -31,7 +30,6 @@
 
 import org.json.JSONObject;
 
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Objects;
@@ -216,7 +214,7 @@ private void showCustomPrivacyList(Activity activity, Class<?> contactClass, Cla
 
     private void showPrivacyDialog(Activity activity, boolean isChat) {
         var userJid = getUserJid(activity, isChat);
-        if (!userJid.isPresent()) return;
+        if (userJid.isNull()) return;
         AlertDialogWpp builder = createPrivacyDialog(activity, userJid.getStripJID());
         builder.show();
     }

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

@@ -53,7 +53,7 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
                 }
                 var lid = (String) XposedHelpers.getObjectField(srj, "jid");
                 var userJid = new FMessageWpp.UserJid(lid);
-                if (!userJid.isPresent()) return;
+                if (userJid.isNull()) return;
                 var privacy = CustomPrivacy.getJSON(userJid.getStripJID());
 
                 var customHideRead = privacy.optBoolean("HideSeen", hideread);