Skip to content

Commit 4c432ca

Browse files
committed
fix: Build errors after rebase (DexKit API mismatches and duplicate strings)
1 parent cf09efd commit 4c432ca

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,10 +1411,6 @@ public synchronized static Field loadSetEditMessageField(ClassLoader loader) thr
14111411
if (method == null)
14121412
method = findFirstMethodUsingStrings(loader, StringMatchType.Contains,
14131413
"UPDATE_MESSAGE_ADD_ON_FLAGS_MAIN_SQL");
1414-
<<<<<<< HEAD
1415-
=======
1416-
1417-
>>>>>>> 63e0b350 (feat: Add new color themes, improve profile photo retrieval, and refine custom theme and wallpaper handling.)
14181414
var methodData = dexkit.getMethodData(DexSignUtil.getMethodDescriptor(method));
14191415
var usingFields = methodData.getUsingFields();
14201416
for (var f : usingFields) {
@@ -1448,10 +1444,10 @@ public synchronized static Class loadDialogViewClass(ClassLoader loader) throws
14481444
return UnobfuscatorCache.getInstance().getClass(loader, () -> {
14491445
var results = dexkit.findMethod(
14501446
new FindMethod()
1451-
.matcher(new MethodMatcher().addUsingString("touch_outside", StringMatchType.Full)));
1447+
.matcher(new MethodMatcher().addUsingString("touch_outside", StringMatchType.Equals)));
14521448
if (results.isEmpty())
14531449
throw new Exception("DialogView class not found");
1454-
return results.get(0).getDeclaringClass().getInstance(loader);
1450+
return results.get(0).getDeclaredClass().getInstance(loader);
14551451
});
14561452
}
14571453

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -436,13 +436,6 @@
436436
<string name="disable_status_in_the_profile_photo">Disable Status in the profile photo</string>
437437
<string name="disable_status_in_the_profile_photo_sum">Disables the circle that appears in the profile photo of each contact when there is new status</string>
438438
<string name="download_not_available">Download not available or media has not been fully downloaded</string>
439-
<string name="call_recording_title">Call Recording</string>
440-
<string name="call_recording_enable">Enable Call Recording</string>
441-
<string name="call_recording_enable_sum">Record incoming and outgoing calls (Voice &amp; Video) as audio.</string>
442-
<string name="call_recording_path">Recordings Output Folder</string>
443-
<string name="video_call_screen_rec">Record Video Calls (Screen)</string>
444-
<string name="video_call_screen_rec_locked">Coming soon!</string>
445-
<string name="coming_soon">Coming soon!</string>
446439
<string name="possible_block_detected">Possible block detected</string>
447440
<string name="block_not_detected">Block not detected</string>
448441
<string name="checking_if_the_contact_is_blocked">Checking if the contact is blocked...</string>
@@ -483,4 +476,6 @@
483476
<string name="restore_feature_title">Restore Feature</string>
484477
<string name="restore_feature_desc">"Coming soon!"</string>
485478
<string name="action_follow_developer">Coming soon!</string>
479+
<string name="enable_spy">Enable Spy Tool</string>
480+
<string name="enable_spy_sum">Logs internal events to Xposed log for debugging.</string>
486481
</resources>

0 commit comments

Comments
 (0)