Merge pull request #134 from frknkrc44/feat-20-xx-support

feat: Add initial 20.xx support

Author: Dev4Mod

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

@@ -890,11 +890,22 @@ public synchronized static Method loadOnChangeStatus(ClassLoader loader) throws
         });
     }
 
+    public synchronized static Class<?> loadViewHolder(ClassLoader loader) throws Exception {
+        Class<?> classViewHolder = XposedHelpers.findClassIfExists("com.whatsapp.conversationslist.ViewHolder", loader);
+
+        // for 20.xx, the current implementation returns null
+        if (classViewHolder == null) {
+            Method method = findFirstMethodUsingStrings(loader, StringMatchType.Contains, "conversations/click/jid ");
+            classViewHolder = method.getParameterTypes()[0];
+        }
+
+        return classViewHolder;
+    }
+
     public synchronized static Field loadViewHolderField1(ClassLoader loader) throws Exception {
         return UnobfuscatorCache.getInstance().getField(loader, () -> {
             Class<?> class1 = loadOnChangeStatus(loader).getDeclaringClass().getSuperclass();
-            Class<?> classViewHolder = XposedHelpers.findClass("com.whatsapp.conversationslist.ViewHolder", loader);
-            return ReflectionUtils.getFieldByType(class1, classViewHolder);
+            return ReflectionUtils.getFieldByType(class1, loadViewHolder(loader));
         });
     }
 

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

@@ -46,7 +46,7 @@ public void doHook() throws Throwable {
         var showOnlineIcon = prefs.getBoolean("dotonline", false);
         if (!showOnlineText && !showOnlineIcon) return;
 
-        var classViewHolder = XposedHelpers.findClass("com.whatsapp.conversationslist.ViewHolder", classLoader);
+        var classViewHolder = Unobfuscator.loadViewHolder(classLoader);
         XposedBridge.hookAllConstructors(classViewHolder, new XC_MethodHook() {
             @SuppressLint("ResourceType")
             @Override

app/src/main/res/values/arrays.xml

@@ -119,6 +119,7 @@
         <item>2.24.17.xx</item>
         <item>2.24.18.xx</item>
         <item>2.24.19.xx</item>
+        <item>2.24.20.xx</item>
     </string-array>
     <string-array name="supported_versions_business">
         <item>2.24.16.xx</item>