From 8bb17fea4db4f4ffa244be0694f52601d390374a Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Tue, 10 Dec 2024 05:36:51 +0300 Subject: [PATCH 1/5] feat: Add another method to load new message method --- .../wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java b/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java index a127c156..dcc9c9b0 100644 --- a/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java +++ b/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java @@ -967,6 +967,14 @@ public synchronized static Method loadNewMessageMethod(ClassLoader loader) throw var field = clazzMessage.getDeclaredField("A02"); methodData = clazzData.findMethod(new FindMethod().matcher(new MethodMatcher().addUsingField(DexSignUtil.getFieldDescriptor(field)).returnType(String.class))); } + if (methodData.isEmpty()) { + var csClazzData = dexkit.findClass(FindClass.create().matcher(ClassMatcher.create().addUsingString("FMessageSystemScheduledCallStart/setData index out of bounds: "))).singleOrNull(); + if (csClazzData != null) { + var csClazz = csClazzData.getInstance(loader); + var field = csClazz.getDeclaredField("A02"); + methodData = clazzData.findMethod(new FindMethod().matcher(new MethodMatcher().addUsingField(DexSignUtil.getFieldDescriptor(field)).returnType(String.class))); + } + } if (methodData.isEmpty()) throw new RuntimeException("NewMessage method not found"); return methodData.get(0).getMethodInstance(loader); }); From d4133c5be5d6cc704b5cfa2c14b7c88b7edd04ef Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Tue, 10 Dec 2024 07:52:40 +0300 Subject: [PATCH 2/5] fix: Replace obsolete TextStatusComposer2 method with new behavior --- .../xposed/core/devkit/Unobfuscator.java | 14 ++++++++------ app/src/main/res/values/arrays.xml | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java b/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java index dcc9c9b0..ae5d8688 100644 --- a/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java +++ b/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java @@ -1557,12 +1557,14 @@ public synchronized static Method loadTextStatusComposer2(ClassLoader classLoade addMethod(MethodMatcher.create().paramCount(1).addParamType(TextDataClass)) )); if (result.isEmpty()) { - result = dexkit.findClass(FindClass.create().matcher( - ClassMatcher.create().addUsingString("ViewOnce messages can not be forwarded"). - addMethod(MethodMatcher.create().paramCount(1).addParamType(TextDataClass)) - )); + var tscClazzData = dexkit.getClassData("com.whatsapp.statuscomposer.composer.TextStatusComposerFragment"); + for (var method : tscClazzData.getMethods()) { + var tdMethod = method.getInvokes().stream().filter(m -> m.isMethod() && m.getParamCount() == 1 && m.getParamTypes().get(0).equals(dexkit.getClassData(TextDataClass))).findFirst(); + tdMethod.ifPresent(methodData -> result.add(methodData.getDeclaredClass())); + } + if (result.isEmpty()) { - throw new RuntimeException("TextStatusComposer2 class not found"); + throw new RuntimeException("TextStatusComposer2 class not found 1"); } } @@ -1570,7 +1572,7 @@ public synchronized static Method loadTextStatusComposer2(ClassLoader classLoade var resultMethod = ReflectionUtils.findMethodUsingFilter(foundClass, method -> method.getParameterCount() == 1 && method.getParameterTypes()[0] == TextDataClass); if (resultMethod != null) return resultMethod; - throw new RuntimeException("TextStatusComposer2 method not found"); + throw new RuntimeException("TextStatusComposer2 method not found 2"); }); } diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 95c8301f..b9740899 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -120,6 +120,7 @@ 2.24.23.xx 2.24.24.xx 2.24.25.xx + 2.24.26.xx 2.24.20.xx @@ -128,6 +129,7 @@ 2.24.23.xx 2.24.24.xx 2.24.25.xx + 2.24.26.xx image/* From 13696a725c7e28a34a97cf2b0c550676667a1fdc Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Tue, 10 Dec 2024 19:29:32 +0300 Subject: [PATCH 3/5] fix edit message history --- .../com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java b/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java index ae5d8688..383e7063 100644 --- a/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java +++ b/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java @@ -1021,7 +1021,8 @@ public synchronized static Method loadGetEditMessageMethod(ClassLoader loader) t } // 21.xx+ method (static) - if (Modifier.isStatic(invoke.getMethodInstance(loader).getModifiers()) && Objects.equals(invoke.getParamTypes().get(0), methodData.getParamTypes().get(0))) { + // 25.xx+ added additional type check + if (Modifier.isStatic(invoke.getMethodInstance(loader).getModifiers()) && Objects.equals(invoke.getParamTypes().get(0), methodData.getParamTypes().get(0)) && !Objects.equals(invoke.getParamTypes().get(0), invoke.getDeclaredClass())) { return invoke.getMethodInstance(loader); } } From 708e51f328fc6ccf8a51efb65ba7505c3c435c1d Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Wed, 11 Dec 2024 01:56:30 +0300 Subject: [PATCH 4/5] fix: Take care about NPE and break after found TextStatusComposer2 method --- .../wppenhacer/xposed/core/devkit/Unobfuscator.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java b/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java index 383e7063..4537d11e 100644 --- a/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java +++ b/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java @@ -1559,9 +1559,14 @@ public synchronized static Method loadTextStatusComposer2(ClassLoader classLoade )); if (result.isEmpty()) { var tscClazzData = dexkit.getClassData("com.whatsapp.statuscomposer.composer.TextStatusComposerFragment"); - for (var method : tscClazzData.getMethods()) { - var tdMethod = method.getInvokes().stream().filter(m -> m.isMethod() && m.getParamCount() == 1 && m.getParamTypes().get(0).equals(dexkit.getClassData(TextDataClass))).findFirst(); - tdMethod.ifPresent(methodData -> result.add(methodData.getDeclaredClass())); + if (tscClazzData != null) { + for (var method : tscClazzData.getMethods()) { + var tdMethod = method.getInvokes().stream().filter(m -> m.isMethod() && m.getParamCount() == 1 && m.getParamTypes().get(0).equals(dexkit.getClassData(TextDataClass))).findFirst(); + if (tdMethod.isPresent()) { + result.add(tdMethod.get().getDeclaredClass()); + break; + } + } } if (result.isEmpty()) { From be582075169922187e8c2b6b80732ea7e3dbd396 Mon Sep 17 00:00:00 2001 From: frknkrc44 Date: Wed, 11 Dec 2024 13:37:42 +0300 Subject: [PATCH 5/5] perf: Optimize the loadTextStatusComposer2 method --- .../wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java b/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java index 4537d11e..381470ec 100644 --- a/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java +++ b/app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java @@ -1563,15 +1563,12 @@ public synchronized static Method loadTextStatusComposer2(ClassLoader classLoade for (var method : tscClazzData.getMethods()) { var tdMethod = method.getInvokes().stream().filter(m -> m.isMethod() && m.getParamCount() == 1 && m.getParamTypes().get(0).equals(dexkit.getClassData(TextDataClass))).findFirst(); if (tdMethod.isPresent()) { - result.add(tdMethod.get().getDeclaredClass()); - break; + return tdMethod.get().getMethodInstance(classLoader); } } } - if (result.isEmpty()) { - throw new RuntimeException("TextStatusComposer2 class not found 1"); - } + throw new RuntimeException("TextStatusComposer2 class not found 1"); } var foundClass = result.get(0).getInstance(classLoader);