Fix custom privacy

Signed-off-by: Dev4Mod <wellingtonmods@gmail.com>

Author: Dev4Mod

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

@@ -872,7 +872,7 @@ public synchronized static Method loadOnChangeStatus(ClassLoader loader) throws
                 if (declaringClassData == null)
                     throw new Exception("OnChangeStatus method not found");
 
-                Class<?> arg1Class = findFirstClassUsingStrings(loader, StringMatchType.Contains, "problematic contact:");
+                Class<?> arg1Class = loadWaContactClass(loader);
                 MethodDataList methodData = declaringClassData.findMethod(
                         FindMethod.create().matcher(MethodMatcher.create().paramCount(6, 8)));
 
@@ -2010,4 +2010,27 @@ public static Class loadVoipManager(ClassLoader classLoader) throws Exception {
         }
         throw new ClassNotFoundException("VoipManager Class not found");
     }
+
+    public static Class loadWaContactClass(ClassLoader classLoader) throws Exception {
+        return UnobfuscatorCache.getInstance().getClass(classLoader, () -> findFirstClassUsingStrings(classLoader, StringMatchType.Contains, "problematic contact:"));
+
+    }
+
+
+    public static Field loadWaContactFromContactInfo(ClassLoader classLoader) throws Exception {
+        return UnobfuscatorCache.getInstance().getField(classLoader, () -> {
+            var classData = dexkit.getClassData("com.whatsapp.chatinfo.ContactInfoActivity");
+            var waContactData = dexkit.getClassData(loadWaContactClass(classLoader));
+            if (waContactData != null && classData != null) {
+                for (var field : classData.getFields()) {
+                    if (field.getTypeName().equals(waContactData.getName())) {
+                        // For some reason Class Contactinfoactivity returns an error when trying to list the available fields
+                        return XposedHelpers.findField(classData.getInstance(classLoader), field.getName());
+                    }
+                }
+            }
+            throw new NoSuchFieldException("WaContact Field not found in ContactInfoActivity");
+        });
+
+    }
 }

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

@@ -21,6 +21,7 @@
 import com.wmods.wppenhacer.xposed.core.Feature;
 import com.wmods.wppenhacer.xposed.core.WppCore;
 import com.wmods.wppenhacer.xposed.core.components.AlertDialogWpp;
+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;
@@ -29,6 +30,7 @@
 
 import org.json.JSONObject;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Objects;
@@ -40,6 +42,7 @@
 public class CustomPrivacy extends Feature {
     private Method chatUserJidMethod;
     private Method groupUserJidMethod;
+    private Field waContactField;
 
     public CustomPrivacy(@NonNull ClassLoader classLoader, @NonNull XSharedPreferences preferences) {
         super(classLoader, preferences);
@@ -60,6 +63,7 @@ public void doHook() throws Throwable {
         Class<?> userJidClass = XposedHelpers.findClass("com.whatsapp.jid.UserJid", classLoader);
         Class<?> groupJidClass = XposedHelpers.findClass("com.whatsapp.jid.GroupJid", classLoader);
 
+        waContactField = Unobfuscator.loadWaContactFromContactInfo(classLoader);
         chatUserJidMethod = ReflectionUtils.findMethodUsingFilter(ContactInfoActivityClass, method -> method.getParameterCount() == 0 && userJidClass.isAssignableFrom(method.getReturnType()));
         groupUserJidMethod = ReflectionUtils.findMethodUsingFilter(GroupInfoActivityClass, method -> method.getParameterCount() == 0 && groupJidClass.isAssignableFrom(method.getReturnType()));
 
@@ -224,7 +228,14 @@ private void showPrivacyDialog(Activity activity, boolean isChat) {
 
     private Object getUserJid(Activity activity, boolean isChat) {
         if (isChat) {
-            return ReflectionUtils.callMethod(chatUserJidMethod, activity);
+            var userJid = ReflectionUtils.callMethod(chatUserJidMethod, activity);
+            if (Objects.requireNonNullElse(WppCore.getRawString(userJid), "").contains("@lid")) {
+                var waContact = ReflectionUtils.getObjectField(waContactField, activity);
+                Class<?> phoneUserJidClass = XposedHelpers.findClass("com.whatsapp.jid.PhoneUserJid", classLoader);
+                Field phoneUserJidField = ReflectionUtils.getFieldByType(waContact.getClass(), phoneUserJidClass);
+                return ReflectionUtils.getObjectField(phoneUserJidField, waContact);
+            }
+            return userJid;
         } else {
             return ReflectionUtils.callMethod(groupUserJidMethod, activity);
         }

app/src/main/java/com/wmods/wppenhacer/xposed/utils/ReflectionUtils.java

@@ -173,9 +173,9 @@ public static Object getDefaultValue(Class<?> paramType) {
         return null;
     }
 
-    public static Object getObjectField(Field loadProfileInfoField, Object thisObject) {
+    public static Object getObjectField(Field field, Object thisObject) {
         try {
-            return loadProfileInfoField.get(thisObject);
+            return field.get(thisObject);
         } catch (Exception e) {
             return null;
         }