From 74c8637943347078955f51325bc6af92a35d4463 Mon Sep 17 00:00:00 2001
From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>
Date: Sat, 21 Sep 2024 17:11:54 -0400
Subject: [PATCH] fix(YouTube - Spoof video streams): Change default client
 type to Android VR

---
 .../misc/fix/playback/SpoofVideoStreamsPatch.kt        |  8 +++-----
 src/main/resources/addresources/values/arrays.xml      | 10 +++++-----
 src/main/resources/addresources/values/strings.xml     |  6 +++---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofVideoStreamsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofVideoStreamsPatch.kt
index 828b54784..b37830762 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofVideoStreamsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofVideoStreamsPatch.kt
@@ -99,17 +99,15 @@ object SpoofVideoStreamsPatch : BytecodePatch(
                 preferences = setOf(
                     SwitchPreference("revanced_spoof_video_streams"),
                     ListPreference(
-                        "revanced_spoof_video_streams_client_type",
-                        summaryKey = null,
-                        entriesKey = "revanced_spoof_video_streams_client_type_entries",
-                        entryValuesKey = "revanced_spoof_video_streams_client_type_entry_values",
+                        "revanced_spoof_video_streams_client",
+                        summaryKey = null
                     ),
                     SwitchPreference(
                         "revanced_spoof_video_streams_ios_force_avc",
                         tag = "app.revanced.integrations.youtube.settings.preference.ForceAVCSpoofingPreference",
                     ),
-                    NonInteractivePreference("revanced_spoof_video_streams_about_ios"),
                     NonInteractivePreference("revanced_spoof_video_streams_about_android_vr"),
+                    NonInteractivePreference("revanced_spoof_video_streams_about_ios"),
                 ),
             ),
         )
diff --git a/src/main/resources/addresources/values/arrays.xml b/src/main/resources/addresources/values/arrays.xml
index cee01a7a3..32751b87b 100644
--- a/src/main/resources/addresources/values/arrays.xml
+++ b/src/main/resources/addresources/values/arrays.xml
@@ -1,15 +1,15 @@
 <resources>
     <app id="youtube">
         <patch id="misc.fix.playback.SpoofVideoStreamsPatch">
-            <string-array name="revanced_spoof_video_streams_client_type_entries">
-                <!-- Device and operating systems names are not translatable, so no need to use strings.xml -->
-                <item>iOS</item>
+            <string-array name="revanced_spoof_video_streams_client_entries">
+                <!-- Operating system names are not translatable, so no need to use strings.xml -->
                 <item>Android VR</item>
+                <item>iOS</item>
             </string-array>
-            <string-array name="revanced_spoof_video_streams_client_type_entry_values">
+            <string-array name="revanced_spoof_video_streams_client_entry_values">
                 <!-- Enum names from Integrations -->
-                <item>IOS</item>
                 <item>ANDROID_VR</item>
+                <item>IOS</item>
             </string-array>
         </patch>
         <patch id="layout.spoofappversion.SpoofAppVersionPatch">
diff --git a/src/main/resources/addresources/values/strings.xml b/src/main/resources/addresources/values/strings.xml
index d34a38e3b..49520bf00 100644
--- a/src/main/resources/addresources/values/strings.xml
+++ b/src/main/resources/addresources/values/strings.xml
@@ -1155,16 +1155,16 @@ This is because Crowdin requires temporarily flattening this file and removing t
             <string name="revanced_spoof_video_streams_summary_on">Video streams are spoofed</string>
             <string name="revanced_spoof_video_streams_summary_off">Video streams are not spoofed\n\nVideo playback may not work</string>
             <string name="revanced_spoof_video_streams_user_dialog_message">Turning off this setting may cause video playback issues.</string>
-            <string name="revanced_spoof_video_streams_client_type_title">Default client</string>
+            <string name="revanced_spoof_video_streams_client_title">Default client</string>
             <string name="revanced_spoof_video_streams_ios_force_avc_title">Force AVC (H.264)</string>
             <string name="revanced_spoof_video_streams_ios_force_avc_summary_on">Video codec is AVC (H.264)</string>
             <string name="revanced_spoof_video_streams_ios_force_avc_summary_off">Video codec is VP9 or AV1</string>
             <string name="revanced_spoof_video_streams_ios_force_avc_no_hardware_vp9_summary_on">Your device does not have VP9 hardware decoding, and this setting is always on when Client spoofing is enabled</string>
             <string name="revanced_spoof_video_streams_ios_force_avc_user_dialog_message">Enabling this might improve battery life and fix playback stuttering.\n\nAVC has a maximum resolution of 1080p, and video playback will use more internet data than VP9 or AV1.</string>
             <string name="revanced_spoof_video_streams_about_ios_title">iOS spoofing side effects</string>
-            <string name="revanced_spoof_video_streams_about_ios_summary">• Movies or paid videos may not play\n• Livestreams start from the beginning</string>
+            <string name="revanced_spoof_video_streams_about_ios_summary">• Movies or paid videos may not play\n• Livestreams start from the beginning\n• Videos may end 1 second early\n• No opus audio codec</string>
             <string name="revanced_spoof_video_streams_about_android_vr_title">Android VR spoofing side effects</string>
-            <string name="revanced_spoof_video_streams_about_android_vr_summary">• Audio track menu is missing</string>
+            <string name="revanced_spoof_video_streams_about_android_vr_summary">• Audio track menu is missing\n• Stable volume is not available</string>
         </patch>
         <!-- This patch is no longer used and these strings will soon be deleted. -->
         <patch id="video.hdrbrightness.HDRBrightnessPatch">