Merge remote-tracking branch 'upstream/master'

sincronizando

Author: pedroborraz

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

@@ -223,6 +223,14 @@ public synchronized static Class getTabsPagerClass(@NonNull ClassLoader loader)
                 : XposedHelpers.findClass("com.whatsapp.home.ui.TabsPager", loader);
     }
 
+    public synchronized static Class getViewOnceViewerActivityClass(@NonNull ClassLoader loader) {
+        Class oldClass = XposedHelpers.findClassIfExists("com.whatsapp.messaging.ViewOnceViewerActivity", loader);
+
+        return oldClass != null
+                ? oldClass
+                : XposedHelpers.findClass("com.whatsapp.viewonce.ui.messaging.ViewOnceViewerActivity", loader);
+    }
+
 //    public static Activity getActivityBySimpleName(String name) {
 //        for (var activity : activities) {
 //            if (activity.getClass().getSimpleName().equals(name)) {

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

@@ -317,7 +317,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
             }
         });
 
-        XposedHelpers.findAndHookMethod("com.whatsapp.messaging.ViewOnceViewerActivity", classLoader, "onCreateOptionsMenu", classLoader.loadClass("android.view.Menu"),
+        XposedHelpers.findAndHookMethod(WppCore.getViewOnceViewerActivityClass(classLoader), "onCreateOptionsMenu", classLoader.loadClass("android.view.Menu"),
                 new XC_MethodHook() {
                     @Override
                     protected void afterHookedMethod(MethodHookParam param) throws Throwable {

app/src/main/java/com/wmods/wppenhacer/xposed/features/media/DownloadViewOnce.java

@@ -73,7 +73,7 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
 
             });
             // View Once Activity
-            XposedHelpers.findAndHookMethod("com.whatsapp.messaging.ViewOnceViewerActivity", classLoader, "onCreateOptionsMenu", classLoader.loadClass("android.view.Menu"),
+            XposedHelpers.findAndHookMethod(WppCore.getViewOnceViewerActivityClass(classLoader), "onCreateOptionsMenu", classLoader.loadClass("android.view.Menu"),
                     new XC_MethodHook() {
                         @Override
                         protected void afterHookedMethod(MethodHookParam param) throws Throwable {

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

@@ -124,13 +124,15 @@
         <item>2.25.7.xx</item>
         <item>2.25.8.xx</item>
         <item>2.25.9.xx</item>
+        <item>2.25.10.xx</item>
     </string-array>
     <string-array name="supported_versions_business">
         <item>2.25.5.xx</item>
         <item>2.25.6.xx</item>
         <item>2.25.7.xx</item>
         <item>2.25.8.xx</item>
         <item>2.25.9.xx</item>
+        <item>2.25.10.xx</item>
     </string-array>
     <string-array name="image_picker">
         <item>image/*</item>