Improve Anti ViewOnce

Author: Dev4Mod

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

@@ -544,38 +544,23 @@ public synchronized static Method[] loadViewOnceMethod(ClassLoader classLoader)
         for (MethodData m : listMethods) {
             var mInstance = m.getMethodInstance(classLoader);
             if (mInstance.getDeclaringClass().isInterface() && mInstance.getDeclaringClass().getMethods().length == 2) {
-                ClassDataList listClasses = dexkit.findClass(new FindClass().matcher(new ClassMatcher().addInterface(mInstance.getDeclaringClass().getName())));
+                ClassDataList listClasses = dexkit.findClass(FindClass.create().matcher(ClassMatcher.create().addInterface(mInstance.getDeclaringClass().getName())));
                 for (ClassData c : listClasses) {
                     Class<?> clazz = c.getInstance(classLoader);
-                    var resultMethod = Arrays.stream(clazz.getDeclaredMethods()).filter(m1 -> m1.getParameterCount() == 0 && m1.getReturnType().equals(int.class)).findFirst().orElse(null);
-                    if (resultMethod == null) continue;
-                    list.add(resultMethod);
+                    for (Method m2 : clazz.getDeclaredMethods()) {
+                        if (m2.getParameterCount() != 1 || m2.getParameterTypes()[0] != int.class || m2.getReturnType() != void.class)
+                            continue;
+                        list.add(m2);
+                    }
                 }
+                if (list.isEmpty()) throw new Exception("ViewOnce method not found");
                 return list.toArray(new Method[0]);
             }
         }
         throw new Exception("ViewOnce method not found");
 
     }
 
-    public synchronized static Class loadViewOnceClass(ClassLoader loader) throws Exception {
-        var clazz = findFirstClassUsingStrings(loader, StringMatchType.Contains, "conversation/row/viewOnce/no file");
-        if (clazz == null) throw new Exception("ViewOnce class not found");
-        return clazz;
-    }
-
-    public synchronized static Method loadViewOnceStoreMethod(ClassLoader loader) throws Exception {
-        var method = findFirstMethodUsingStrings(loader, StringMatchType.Contains, "INSERT_VIEW_ONCE_SQL");
-        if (method == null) throw new Exception("ViewOnce class not found");
-        return method;
-    }
-
-    public synchronized static Method loadViewOnceChangeMethod(ClassLoader loader) throws Exception {
-        var method = findFirstMethodUsingStrings(loader, StringMatchType.Contains, "com.whatsapp.messaging.ViewOnceViewerActivity");
-        if (method == null) throw new Exception("ViewOnce class not found");
-        return method;
-    }
-
 
     /**
      * @noinspection SimplifyOptionalCallChains

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

@@ -1,20 +1,15 @@
 package com.wmods.wppenhacer.xposed.features.privacy;
 
 
-import android.view.View;
-
 import androidx.annotation.NonNull;
 
 import com.wmods.wppenhacer.xposed.core.Feature;
 import com.wmods.wppenhacer.xposed.core.components.FMessageWpp;
 import com.wmods.wppenhacer.xposed.core.devkit.Unobfuscator;
-import com.wmods.wppenhacer.xposed.utils.ReflectionUtils;
 
 import de.robv.android.xposed.XC_MethodHook;
-import de.robv.android.xposed.XC_MethodReplacement;
 import de.robv.android.xposed.XSharedPreferences;
 import de.robv.android.xposed.XposedBridge;
-import de.robv.android.xposed.XposedHelpers;
 
 public class ViewOnce extends Feature {
     private boolean isFromMe;
@@ -28,54 +23,20 @@ public void doHook() throws Exception {
         if (!prefs.getBoolean("viewonce", false)) return;
 
         var methods = Unobfuscator.loadViewOnceMethod(classLoader);
-        var classViewOnce = Unobfuscator.loadViewOnceClass(classLoader);
-        logDebug(classViewOnce);
-        var viewOnceStoreMethod = Unobfuscator.loadViewOnceStoreMethod(classLoader);
-        logDebug(Unobfuscator.getMethodDescriptor(viewOnceStoreMethod));
-        var viewOnceChangeMethod = Unobfuscator.loadViewOnceChangeMethod(classLoader);
-
-        XposedBridge.hookMethod(viewOnceStoreMethod, new XC_MethodHook() {
-            @Override
-            protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                isFromMe = false;
-                var messageObject = param.args[0];
-                if (messageObject == null) return;
-                isFromMe = new FMessageWpp(messageObject).getKey().isFromMe;
-            }
-        });
 
         for (var method : methods) {
             logDebug(Unobfuscator.getMethodDescriptor(method));
             XposedBridge.hookMethod(method, new XC_MethodHook() {
                 @Override
-                protected void afterHookedMethod(MethodHookParam param) {
-                    int returnValue = (int) param.getResult();
-                    if (returnValue != 2) {
-                        if (ReflectionUtils.isCalledFromClass(classViewOnce)) {
-                            param.setResult(0);
-                        } else if (!isFromMe && (ReflectionUtils.isCalledFromClass(viewOnceStoreMethod.getDeclaringClass()))) {
-                            param.setResult(0);
-                        }
+                protected void beforeHookedMethod(MethodHookParam param) {
+                    int returnValue = (int) param.args[0];
+                    var fMessage = new FMessageWpp(param.thisObject);
+                    if (returnValue == 1 && !fMessage.getKey().isFromMe) {
+                        param.args[0] = 0;
                     }
                 }
             });
         }
-        // This prevents view audio once from being set to previewed
-        XposedBridge.hookMethod(viewOnceChangeMethod,
-                new XC_MethodHook() {
-                    private Unhook unhook;
-
-                    @Override
-                    protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
-                        unhook = XposedHelpers.findAndHookMethod(View.class, "postDelayed", Runnable.class, long.class, XC_MethodReplacement.returnConstant(false));
-                    }
-
-                    @Override
-                    protected void afterHookedMethod(MethodHookParam param) throws Throwable {
-                        unhook.unhook();
-                    }
-                });
-
     }
 
     @NonNull