Fix bug in show last seen in homescreen

Author: Dev4Mod

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

@@ -916,22 +916,11 @@ public synchronized static Method loadStatusUserMethod(ClassLoader loader) throw
 
     public synchronized static Method loadSendPresenceMethod(ClassLoader loader) throws Exception {
         return UnobfuscatorCache.getInstance().getMethod(loader, () -> {
-            var method = findFirstMethodUsingStrings(loader, StringMatchType.Contains, "app/send-presence-subscription jid=");
-            if (method == null) throw new Exception("SendPresence method not found");
-
-            // for 22.xx, method returns wrong one
-            var methodData = dexkit.getMethodData(method);
-            var groupJidClass = XposedHelpers.findClass("com.whatsapp.jid.GroupJid", loader);
-            var classCheckMethod = dexkit.findMethod(FindMethod.create()
-                            .searchInClass(Collections.singletonList(methodData.getDeclaredClass()))
-                            .matcher(MethodMatcher.create().returnType(groupJidClass)))
-                    .singleOrNull();
-            if (classCheckMethod == null) {
-                var newMethod = methodData.getCallers().singleOrNull(method1 -> method1.getParamCount() == 4);
-                if (newMethod == null) throw new Exception("SendPresence method not found 2");
-                return newMethod.getMethodInstance(loader);
-            }
-            return method;
+            var methodData = dexkit.findMethod(FindMethod.create().matcher(MethodMatcher.create().addUsingString("app/send-presence-subscription jid=")));
+            if (methodData.isEmpty()) throw new Exception("SendPresence method not found");
+            var newMethod = methodData.get(0).getCallers().singleOrNull(method1 -> method1.getParamCount() == 4);
+            if (newMethod == null) throw new Exception("SendPresence method not found 2");
+            return newMethod.getMethodInstance(loader);
         });
     }
 
@@ -1940,4 +1929,8 @@ public static Class[] loadProximitySensorListenerClasses(ClassLoader classLoader
     public static Class<?> loadRefreshStatusClass(ClassLoader classLoader) throws Exception {
         return UnobfuscatorCache.getInstance().getClass(classLoader, () -> findFirstClassUsingStrings(classLoader, StringMatchType.Contains, "Report tab open only once per session"));
     }
+
+    public static Method loadTcTokenMethod(ClassLoader classLoader) throws Exception {
+        return UnobfuscatorCache.getInstance().getMethod(classLoader, () -> findFirstMethodUsingStrings(classLoader, StringMatchType.Contains, "GET_RECEIVED_TOKEN_AND_TIMESTAMP_BY_JID"));
+    }
 }

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

@@ -110,7 +110,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
         logDebug(Unobfuscator.getMethodDescriptor(getStatusUser));
         var sendPresenceMethod = Unobfuscator.loadSendPresenceMethod(classLoader);
         logDebug(Unobfuscator.getMethodDescriptor(sendPresenceMethod));
-
+        var tcTokenMethod = Unobfuscator.loadTcTokenMethod(classLoader);
         var absViewHolderClass = Unobfuscator.loadAbsViewHolder(classLoader);
 
 
@@ -128,6 +128,11 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
             }
         });
 
+        // load methods
+        var tokenClass = sendPresenceMethod.getParameterTypes()[2];
+        var fieldTokenDBInstance = ReflectionUtils.getFieldByExtendType(sendPresenceMethod.getDeclaringClass(), tcTokenMethod.getDeclaringClass());
+
+
         XposedBridge.hookMethod(onChangeStatus, new XC_MethodHook() {
             @Override
             @SuppressLint("ResourceType")
@@ -148,15 +153,12 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                 var jidObject = jidFiled.get(object);
                 var jid = WppCore.getRawString(jidObject);
                 if (WppCore.isGroup(jid)) return;
-                Class<?> JidClass = classLoader.loadClass("com.whatsapp.jid.Jid");
-                var method = ReflectionUtils.findMethodUsingFilter(sendPresenceMethod.getDeclaringClass(), method1 -> method1.getParameterCount() == 2 && JidClass.isAssignableFrom(method1.getParameterTypes()[0]) && method1.getParameterTypes()[1] == sendPresenceMethod.getDeclaringClass());
-                var instance = ReflectionUtils.callMethod(method, null, jidObject, mInstancePresence); //XposedHelpers.newInstance(clazz, new Object[]{null, null});
-                // for 22.xx, the parameter count is 4
-                if (sendPresenceMethod.getParameterCount() == 4) {
-                    sendPresenceMethod.invoke(null, jidObject, null, instance, mInstancePresence);
-                } else {
-                    sendPresenceMethod.invoke(null, jidObject, instance, mInstancePresence);
-                }
+
+                var tokenDBInstance = fieldTokenDBInstance.get(mInstancePresence);
+                var tokenData = ReflectionUtils.callMethod(tcTokenMethod, tokenDBInstance, jidObject);
+                var tokenObj = tokenClass.getConstructors()[0].newInstance(tokenData == null ? null : XposedHelpers.getObjectField(tokenData, "A01"));
+                sendPresenceMethod.invoke(null, jidObject, null, tokenObj, mInstancePresence);
+
                 var status = (String) ReflectionUtils.callMethod(getStatusUser, mStatusUser, object, false);
                 var currentPosition = (int) ReflectionUtils.callMethod(getAdapterPositionMethod, viewHolder);
                 if (currentPosition != position) return;