feat(youtube/spoof-player-parameters): match with official revanced patches

src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/fingerprints/SubtitleWindowFingerprint.kt

@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.utils.fix.parameter.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-object SubtitleWindowFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
-    parameters = listOf("I", "I", "I", "Z", "Z"),
-    customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("/SubtitleWindowSettings;") }
-)

src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/patch/SpoofPlayerParameterPatch.kt

@@ -6,7 +6,6 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.data.toMethodWalker
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
@@ -22,11 +21,9 @@ import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.ProtobufPar
 import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.ScrubbedPreviewLayoutFingerprint
 import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.StoryboardThumbnailFingerprint
 import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.StoryboardThumbnailParentFingerprint
-import app.revanced.patches.youtube.utils.fix.parameter.fingerprints.SubtitleWindowFingerprint
 import app.revanced.patches.youtube.utils.playertype.patch.PlayerTypeHookPatch
 import app.revanced.patches.youtube.utils.resourceid.patch.SharedResourceIdPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
-import app.revanced.patches.youtube.utils.videoid.general.patch.VideoIdPatch
 import app.revanced.util.integrations.Constants.MISC_PATH
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
@@ -37,8 +34,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 @DependsOn(
     [
         SharedResourceIdPatch::class,
-        PlayerTypeHookPatch::class,
-        VideoIdPatch::class
+        PlayerTypeHookPatch::class
     ]
 )
 @YouTubeCompatibility
@@ -47,8 +43,7 @@ class SpoofPlayerParameterPatch : BytecodePatch(
     listOf(
         ProtobufParameterBuilderFingerprint,
         ScrubbedPreviewLayoutFingerprint,
-        StoryboardThumbnailParentFingerprint,
-        SubtitleWindowFingerprint
+        StoryboardThumbnailParentFingerprint
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
@@ -73,7 +68,7 @@ class SpoofPlayerParameterPatch : BytecodePatch(
         } ?: return ProtobufParameterBuilderFingerprint.toErrorResult()
 
         // When the player parameter is spoofed in incognito mode, this value will always be false
-        // If this value is true, the timestamp and chapter are showned when tapping the seekbar.
+        // If this value is true, the timestamp and chapter are shown when tapping the seekbar.
         StoryboardThumbnailParentFingerprint.result?.classDef?.let { classDef ->
             StoryboardThumbnailFingerprint.also {
                 it.resolve(
@@ -90,7 +85,7 @@ class SpoofPlayerParameterPatch : BytecodePatch(
                     addInstructions(
                         targetIndex + 1,
                         """
-                            invoke-static {v$targetRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->getSeekbarThumbnailOverrideValue(Z)Z
+                            invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->getSeekbarThumbnailOverrideValue()Z
                             move-result v$targetRegister
                             return v$targetRegister
                             """
@@ -118,24 +113,6 @@ class SpoofPlayerParameterPatch : BytecodePatch(
             }
         } ?: return ScrubbedPreviewLayoutFingerprint.toErrorResult()
 
-        // fix protobuf spoof side issue
-        SubtitleWindowFingerprint.result?.mutableMethod?.addInstructions(
-            0,
-            """
-                invoke-static {p1, p2, p3, p4, p5}, $INTEGRATIONS_CLASS_DESCRIPTOR->getSubtitleWindowSettingsOverride(IIIZZ)[I
-                move-result-object v0
-                const/4 v1, 0x0
-                aget p1, v0, v1     # ap, anchor position
-                const/4 v1, 0x1
-                aget p2, v0, v1     # ah, horizontal anchor
-                const/4 v1, 0x2
-                aget p3, v0, v1     # av, vertical anchor
-            """
-        ) ?: return SubtitleWindowFingerprint.toErrorResult()
-
-        // Hook video id, required for subtitle fix.
-        VideoIdPatch.injectCall("$MISC_PATH/SpoofPlayerParameterPatch;->setCurrentVideoId(Ljava/lang/String;)V")
-
         /**
          * Add settings
          */

src/main/resources/youtube/settings/host/values/strings.xml

@@ -603,20 +603,14 @@ If later turned off, the old UI may remain until clear the app data"</string>
     <string name="revanced_spoof_app_version_target_entry_title">Spoof app version target</string>
     <string name="revanced_spoof_app_version_target_summary">Type the spoof app version target</string>
     <string name="revanced_spoof_app_version_target_title">Edit spoof app version</string>
-    <string name="revanced_spoof_player_parameter_type_summary_off">"Player parameters of Shorts
+    <string name="revanced_spoof_player_parameter_summary">"Spoofs player parameters to prevent playback issues
 
 Known issues
-- Channel watermark is always hidden
-- Downloading videos may not work
-- End screen cards are always hidden"</string>
-    <string name="revanced_spoof_player_parameter_type_summary_on">"Player parameters of incognito mode
-
-Known issues
-- Ambient mode may not work
-- Downloading videos may not work
-- Seekbar thumbnails are hidden"</string>
-    <string name="revanced_spoof_player_parameter_type_title">Spoof player parameter type</string>
-    <string name="revanced_spoof_player_parameter_summary">Spoofs player parameters to prevent playback issues</string>
+• Ambient mode may not work
+• Clip cannot be played normally
+• Downloading videos may not work
+• Filmstrip overlay are always hidden
+• Seekbar thumbnails are hidden"</string>
     <string name="revanced_spoof_player_parameter_title">Spoof player parameter</string>
     <string name="revanced_swipe_controls">Swipe controls</string>
     <string name="revanced_swipe_magnitude_threshold_summary">The amount of threshold for swipe to occur</string>

src/main/resources/youtube/settings/xml/revanced_prefs.xml

@@ -279,9 +279,8 @@
         <app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:hint="18.20.39" android:title="@string/revanced_spoof_app_version_target_title" android:key="revanced_spoof_app_version_target" android:summary="@string/revanced_spoof_app_version_target_summary" android:inputType="text" android:dependency="revanced_spoof_app_version" />SETTINGS: SPOOF_APP_VERSION -->
 
         <!-- SETTINGS: SPOOF_PLAYER_PARAMETER
-        <SwitchPreference android:title="@string/revanced_spoof_player_parameter_title" android:key="revanced_spoof_player_parameter" android:defaultValue="false" android:summary="@string/revanced_spoof_player_parameter_summary" />
-        <SwitchPreference android:title="@string/revanced_spoof_player_parameter_type_title" android:key="revanced_spoof_player_parameter_type" android:defaultValue="false" android:summaryOn="@string/revanced_spoof_player_parameter_type_summary_on" android:summaryOff="@string/revanced_spoof_player_parameter_type_summary_off" />SETTINGS: SPOOF_PLAYER_PARAMETER -->
-
+        <SwitchPreference android:title="@string/revanced_spoof_player_parameter_title" android:key="revanced_spoof_player_parameter" android:defaultValue="false" android:summary="@string/revanced_spoof_player_parameter_summary" />SETTINGS: SPOOF_PLAYER_PARAMETER -->
+	
         <Preference android:title=" " android:selectable="false" android:summary="@string/pref_about_category" />
         <PreferenceScreen android:title="@string/revanced_patches_information"  android:summary="@string/revanced_patches_information_summary" >
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_tool_used" />