Skip to content

feat: Add initial 19.xx support for WA and WB #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 28, 2024
Merged

feat: Add initial 19.xx support for WA and WB #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02ed2b3
feat: Add initial 19.xx support
frknkrc44 Sep 21, 2024
a00106b
fix: Adapt checkGroup for 19.xx
frknkrc44 Sep 26, 2024
ba17fa7
feat: Add business 19.xx as supported version
frknkrc44 Sep 26, 2024
0caa014
feat: Fix last seen
frknkrc44 Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion app/src/main/java/com/wmods/wppenhacer/xposed/core/devkit/Unobfuscator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,27 @@ public synchronized static Method loadOnChangeStatus(ClassLoader loader) throws
return UnobfuscatorCache.getInstance().getMethod(loader, () -> {
Method method = findFirstMethodUsingStrings(loader, StringMatchType.Contains, "ConversationViewFiller/setParentGroupProfilePhoto");
if (method == null) throw new Exception("OnChangeStatus method not found");

// for 19.xx, the current implementation returns wrong method
if (method.getParameterCount() < 6) {
ClassData declaringClassData = dexkit.getClassData(method.getDeclaringClass());
if (declaringClassData == null) throw new Exception("OnChangeStatus method not found");

Class<?> arg1Class = findFirstClassUsingStrings(loader, StringMatchType.Contains, "problematic contact:");
MethodDataList methodData = declaringClassData.findMethod(
FindMethod.create().matcher(MethodMatcher.create().paramCount(6, 8)));

for (var methodItem : methodData) {
var paramTypes = methodItem.getParamTypes();

if (paramTypes.get(0).getInstance(loader) == arg1Class &&
paramTypes.get(1).getInstance(loader) == arg1Class) {
method = methodItem.getMethodInstance(loader);
break;
}
}
}

return method;
});
}
Expand Down Expand Up @@ -1397,7 +1418,7 @@ public synchronized static Method loadOnPlaybackFinished(ClassLoader classLoader

public synchronized static Method loadNextStatusRunMethod(ClassLoader classLoader) throws Exception {
return UnobfuscatorCache.getInstance().getMethod(classLoader, () -> {
var methodList = dexkit.findMethod(new FindMethod().matcher(new MethodMatcher().addUsingString("SequentialVoiceMemoPlayer/playMiddleTone").name("run")));
var methodList = dexkit.findMethod(new FindMethod().matcher(new MethodMatcher().addUsingString("playMiddleTone").name("run")));
if (methodList.isEmpty()) throw new RuntimeException("RunNextStatus method not found");
return methodList.get(0).getMethodInstance(classLoader);
});
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/wmods/wppenhacer/xposed/features/customization/SeparateGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,8 @@ public boolean addAll(@NonNull Collection c) {
private boolean checkGroup(Object chat) {
var requiredServer = isGroup ? "g.us" : "s.whatsapp.net";
var jid = getObjectField(chat, "A00");
if (jid == null) jid = getObjectField(chat, "A01");
if (jid == null) return true;
if (XposedHelpers.findMethodExactIfExists(jid.getClass(), "getServer") != null) {
var server = (String) callMethod(jid, "getServer");
return server.equals(requiredServer);
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
<item>2.24.16.xx</item>
<item>2.24.17.xx</item>
<item>2.24.18.xx</item>
<item>2.24.19.xx</item>
</string-array>
<string-array name="supported_versions_business">
<item>2.24.12.xx</item>
Expand All @@ -130,6 +131,7 @@
<item>2.24.16.xx</item>
<item>2.24.17.xx</item>
<item>2.24.18.xx</item>
<item>2.24.19.xx</item>
</string-array>
<string-array name="image_picker">
<item>image/*</item>
Expand Down