Merge remote-tracking branch 'upstream/dev' into feat/patcher_instruction_filters

# Conflicts:
#	patches/src/main/kotlin/app/revanced/patches/twitter/misc/links/ChangeLinkSharingDomainPatch.kt
#	patches/src/main/kotlin/app/revanced/patches/twitter/misc/links/Fingerprints.kt
This commit is contained in:
LisoUseInAIKyrios 2025-10-11 02:14:23 +04:00
commit a1c9170cc9
123 changed files with 1428 additions and 268 deletions

View file

@ -261,7 +261,6 @@ public class GmsCoreSupport {
}
private static String getGmsCoreVendorGroupId() {
// Modified during patching.
throw new IllegalStateException();
return "app.revanced"; // Modified during patching.
}
}

View file

@ -2,22 +2,19 @@ package app.revanced.twitter.patches.links;
@SuppressWarnings("unused")
public final class ChangeLinkSharingDomainPatch {
private static final String DOMAIN_NAME = "https://fxtwitter.com";
private static final String LINK_FORMAT = "%s/%s/status/%s";
/**
* Injection point.
* Method is modified during patching. Do not change.
*/
public static String formatResourceLink(Object... formatArgs) {
String username = (String) formatArgs[0];
String tweetId = (String) formatArgs[1];
return String.format(LINK_FORMAT, DOMAIN_NAME, username, tweetId);
private static String getShareDomain() {
return "";
}
/**
* Injection point.
*/
public static String formatLink(long tweetId, String username) {
return String.format(LINK_FORMAT, DOMAIN_NAME, username, tweetId);
return String.format(LINK_FORMAT, getShareDomain(), username, tweetId);
}
}

View file

@ -29,7 +29,11 @@ public class SpoofVideoStreamsPatch {
public static void setClientOrderToUse() {
ClientType client = Settings.SPOOF_VIDEO_STREAMS_CLIENT_TYPE.get();
if (client == ANDROID_VR_1_43_32 && Settings.SPOOF_VIDEO_STREAMS_AV1.get()) {
// Use VR 1.61 client that has AV1 if user settings allow it.
// AVC cannot be forced with VR 1.61 because it uses VP9 and AV1.
// If both settings are on, then force AVC takes priority and VR 1.43 is used.
if (client == ANDROID_VR_1_43_32 && Settings.SPOOF_VIDEO_STREAMS_AV1.get()
&& !Settings.FORCE_AVC_CODEC.get()) {
client = ANDROID_VR_1_61_48;
}