diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/client/YouTubeAppClient.kt b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/client/YouTubeAppClient.kt index 6bf63b27e..c50bca220 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/client/YouTubeAppClient.kt +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/client/YouTubeAppClient.kt @@ -382,11 +382,11 @@ object YouTubeAppClient { companion object { val CLIENT_ORDER_TO_USE_YOUTUBE: Array = arrayOf( - ANDROID_VR, - ANDROID_UNPLUGGED, IOS_UNPLUGGED, + ANDROID_UNPLUGGED, ANDROID_CREATOR, IOS, + ANDROID_VR, ANDROID_VR_NO_AUTH, ) } diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/SpoofStreamingDataPatch.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/SpoofStreamingDataPatch.java index aaab9e096..1580244a8 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/SpoofStreamingDataPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/SpoofStreamingDataPatch.java @@ -200,7 +200,7 @@ public class SpoofStreamingDataPatch extends BlockRequestPatch { @Override public boolean isAvailable() { return BaseSettings.SPOOF_STREAMING_DATA.get() && - BaseSettings.SPOOF_STREAMING_DATA_TYPE.get() == ClientType.ANDROID_VR_NO_AUTH; + BaseSettings.SPOOF_STREAMING_DATA_CLIENT.get() == ClientType.ANDROID_VR_NO_AUTH; } } } diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/StreamingDataRequest.kt b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/StreamingDataRequest.kt index 425ccfcb3..ab6dba404 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/StreamingDataRequest.kt +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/spoof/requests/StreamingDataRequest.kt @@ -92,14 +92,14 @@ class StreamingDataRequest private constructor( "X-GOOG-API-FORMAT-VERSION", VISITOR_ID_HEADER ) - private val SPOOF_STREAMING_DATA_TYPE: YouTubeAppClient.ClientType = - BaseSettings.SPOOF_STREAMING_DATA_TYPE.get() + private val SPOOF_STREAMING_DATA_CLIENT: YouTubeAppClient.ClientType = + BaseSettings.SPOOF_STREAMING_DATA_CLIENT.get() private val CLIENT_ORDER_TO_USE: Array = - YouTubeAppClient.availableClientTypes(SPOOF_STREAMING_DATA_TYPE) + YouTubeAppClient.availableClientTypes(SPOOF_STREAMING_DATA_CLIENT) private val DEFAULT_CLIENT_IS_ANDROID_VR_NO_AUTH: Boolean = - SPOOF_STREAMING_DATA_TYPE == YouTubeAppClient.ClientType.ANDROID_VR_NO_AUTH + SPOOF_STREAMING_DATA_CLIENT == YouTubeAppClient.ClientType.ANDROID_VR_NO_AUTH private var lastSpoofedClientType: YouTubeAppClient.ClientType? = null diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java b/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java index ed18171f7..c212cef74 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/settings/BaseSettings.java @@ -43,7 +43,7 @@ public class BaseSettings { "revanced_spoof_streaming_data_ios_force_avc_user_dialog_message"); public static final BooleanSetting SPOOF_STREAMING_DATA_STATS_FOR_NERDS = new BooleanSetting("revanced_spoof_streaming_data_stats_for_nerds", TRUE); // Client type must be last spoof setting due to cyclic references. - public static final EnumSetting SPOOF_STREAMING_DATA_TYPE = new EnumSetting<>("revanced_spoof_streaming_data_type", YouTubeAppClient.ClientType.ANDROID_VR, true); + public static final EnumSetting SPOOF_STREAMING_DATA_CLIENT = new EnumSetting<>("revanced_spoof_streaming_data_client", YouTubeAppClient.ClientType.IOS_UNPLUGGED, true); public static final StringSetting SPOOF_STREAMING_DATA_PO_TOKEN = new StringSetting("revanced_spoof_streaming_data_po_token", "", true); public static final StringSetting SPOOF_STREAMING_DATA_VISITOR_DATA = new StringSetting("revanced_spoof_streaming_data_visitor_data", "", true); diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java index 99958d018..b116a3d5c 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/preference/SpoofStreamingDataSideEffectsPreference.java @@ -62,7 +62,7 @@ public class SpoofStreamingDataSideEffectsPreference extends Preference { } private void updateUI() { - final String clientName = Settings.SPOOF_STREAMING_DATA_TYPE.get().name().toLowerCase(); + final String clientName = Settings.SPOOF_STREAMING_DATA_CLIENT.get().name().toLowerCase(); final String summaryTextKey = "revanced_spoof_streaming_data_side_effects_" + clientName; setSummary(str(summaryTextKey));