diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java index 8eeedc9a5..84e2faf8b 100644 --- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java @@ -29,6 +29,6 @@ public class BaseSettings { public static final BooleanSetting SPOOF_VIDEO_STREAMS_IOS_FORCE_AVC = new BooleanSetting("revanced_spoof_video_streams_ios_force_avc", FALSE, true, "revanced_spoof_video_streams_ios_force_avc_user_dialog_message", new SpoofiOSAvailability()); // Client type must be last spoof setting due to cyclic references. - public static final EnumSetting SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client_type", ClientType.ANDROID_VR, true, parent(SPOOF_VIDEO_STREAMS)); + public static final EnumSetting SPOOF_VIDEO_STREAMS_CLIENT_TYPE = new EnumSetting<>("revanced_spoof_video_streams_client_type", ClientType.ANDROID_UNPLUGGED, true, parent(SPOOF_VIDEO_STREAMS)); } diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java index daf555068..b2e7a5e5f 100644 --- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/spoof/ClientType.java @@ -66,22 +66,6 @@ public enum ClientType { true, "Android Creator" ), - ANDROID_VR( - ANDROID_VR_NO_AUTH.id, - ANDROID_VR_NO_AUTH.clientName, - ANDROID_VR_NO_AUTH.packageName, - ANDROID_VR_NO_AUTH.deviceMake, - ANDROID_VR_NO_AUTH.deviceModel, - ANDROID_VR_NO_AUTH.osName, - ANDROID_VR_NO_AUTH.osVersion, - ANDROID_VR_NO_AUTH.androidSdkVersion, - ANDROID_VR_NO_AUTH.buildId, - ANDROID_VR_NO_AUTH.cronetVersion, - ANDROID_VR_NO_AUTH.clientVersion, - ANDROID_VR_NO_AUTH.requiresAuth, - true, - "Android VR" - ), IOS_UNPLUGGED( 33, "IOS_UNPLUGGED", @@ -112,6 +96,22 @@ public enum ClientType { forceAVC() ? "iOS TV Force AVC" : "iOS TV" + ), + ANDROID_VR_AUTH( + ANDROID_VR_NO_AUTH.id, + ANDROID_VR_NO_AUTH.clientName, + ANDROID_VR_NO_AUTH.packageName, + ANDROID_VR_NO_AUTH.deviceMake, + ANDROID_VR_NO_AUTH.deviceModel, + ANDROID_VR_NO_AUTH.osName, + ANDROID_VR_NO_AUTH.osVersion, + ANDROID_VR_NO_AUTH.androidSdkVersion, + ANDROID_VR_NO_AUTH.buildId, + ANDROID_VR_NO_AUTH.cronetVersion, + ANDROID_VR_NO_AUTH.clientVersion, + ANDROID_VR_NO_AUTH.requiresAuth, + true, + "Android VR" ); private static boolean forceAVC() { diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java index d46d5d7ef..a0df8ce07 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java @@ -85,7 +85,7 @@ public class SpoofStreamingDataSideEffectsPreference extends Preference { String summary = str(key + "_summary"); // Android VR supports AV1 but all other clients do not. - if (clientType != ClientType.ANDROID_VR && clientType != ClientType.ANDROID_VR_NO_AUTH) { + if (clientType != ClientType.ANDROID_VR_AUTH && clientType != ClientType.ANDROID_VR_NO_AUTH) { summary += '\n' + str("revanced_spoof_video_streams_about_no_av1"); } diff --git a/patches/src/main/resources/addresources/values/arrays.xml b/patches/src/main/resources/addresources/values/arrays.xml index 1c03c66c0..22cfc21cb 100644 --- a/patches/src/main/resources/addresources/values/arrays.xml +++ b/patches/src/main/resources/addresources/values/arrays.xml @@ -114,16 +114,14 @@ - Android VR - @string/revanced_spoof_video_streams_client_type_android_vr_no_auth Android TV + Android VR iOS TV - ANDROID_VR - ANDROID_VR_NO_AUTH ANDROID_UNPLUGGED + ANDROID_VR_NO_AUTH IOS_UNPLUGGED diff --git a/patches/src/main/resources/addresources/values/strings.xml b/patches/src/main/resources/addresources/values/strings.xml index a02157997..9f3b7862e 100644 --- a/patches/src/main/resources/addresources/values/strings.xml +++ b/patches/src/main/resources/addresources/values/strings.xml @@ -1417,8 +1417,6 @@ Enabling this can unlock higher video qualities" Video playback may not work" Turning off this setting may cause video playback issues. Default client - - Android VR (no auth) Force iOS AVC (H.264) Video codec is forced to AVC (H.264) Video codec is determined automatically