chore(release): 4.8.0-dev.24 [skip ci]

# [4.8.0-dev.24](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.23...v4.8.0-dev.24) (2024-05-21) ### Bug Fixes * **YouTube - Client spoof:** Spoof client to fix playback ([#3199](https://github.com/ReVanced/revanced-patches/issues/3199)) ([6ac3ba0](6ac3ba03aa))
fix(YouTube - Client spoof): Spoof client to fix playback (#3199 )
2026-01-15 23:33:57 +00:00 · 2024-05-21 00:43:47 +00:00 · 2024-05-21 02:41:35 +02:00 · 2024-05-18 21:07:29 +00:00 · 2024-05-18 23:04:58 +02:00 · 2024-05-18 21:04:01 +00:00
46 changed files with 967 additions and 96 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,81 @@
+# [4.8.0-dev.24](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.23...v4.8.0-dev.24) (2024-05-21)
+
+
+### Bug Fixes
+
+* **YouTube - Client spoof:** Spoof client to fix playback ([#3199](https://github.com/ReVanced/revanced-patches/issues/3199)) ([bec1eef](https://github.com/ReVanced/revanced-patches/commit/bec1eef10f2eb4e15696acb271357f1621543de1))
+
+# [4.8.0-dev.23](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.22...v4.8.0-dev.23) (2024-05-18)
+
+
+### Features
+
+* **Piccoma:** Add `Spoof Android device ID` patch ([#3145](https://github.com/ReVanced/revanced-patches/issues/3145)) ([d953c6b](https://github.com/ReVanced/revanced-patches/commit/d953c6bdd4315d2ba44845fd569a3d12ac4d1af0))
+
+# [4.8.0-dev.22](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.21...v4.8.0-dev.22) (2024-05-18)
+
+
+### Bug Fixes
+
+* Use correct preference key ([3732b2c](https://github.com/ReVanced/revanced-patches/commit/3732b2ce6b617b4c1c6647397b614f8a040eece3))
+
+# [4.8.0-dev.21](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.20...v4.8.0-dev.21) (2024-05-18)
+
+
+### Features
+
+* **Piccoma:** Add `Disable tracking` patch ([#3143](https://github.com/ReVanced/revanced-patches/issues/3143)) ([8ab9e8f](https://github.com/ReVanced/revanced-patches/commit/8ab9e8f89d2bd014138e31dab7004f8ba77cae10))
+* **YouTube - Navigation buttons:** Add option to hide navigation button labels ([#3189](https://github.com/ReVanced/revanced-patches/issues/3189)) ([f9dc705](https://github.com/ReVanced/revanced-patches/commit/f9dc7050513b9fdb7766838a63a172f1478296f7))
+
+# [4.8.0-dev.20](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.19...v4.8.0-dev.20) (2024-05-16)
+
+
+### Features
+
+* **YT Music:** Add support for `7.01.52` ([#3177](https://github.com/ReVanced/revanced-patches/issues/3177)) ([e9bfb25](https://github.com/ReVanced/revanced-patches/commit/e9bfb25dfe85754fd7fa5c9db934bb4fc52e4694))
+
+# [4.8.0-dev.19](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.18...v4.8.0-dev.19) (2024-05-16)
+
+
+### Features
+
+* **YouTube - Hide Shorts components:** Hide 'Buy super thanks' button ([#3176](https://github.com/ReVanced/revanced-patches/issues/3176)) ([89c1548](https://github.com/ReVanced/revanced-patches/commit/89c154861c8b3afa665542e97ff201c3e84410b2))
+
+# [4.8.0-dev.18](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.17...v4.8.0-dev.18) (2024-05-14)
+
+
+### Bug Fixes
+
+* **YouTube Music:** Make `Hide 'Get Music Premium' label` and `Remove upgrade button` compatible with latest version ([#3164](https://github.com/ReVanced/revanced-patches/issues/3164)) ([3ff20de](https://github.com/ReVanced/revanced-patches/commit/3ff20dee4aea49ca77dcd3fbe148287b55a2b5e3))
+
+# [4.8.0-dev.17](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.16...v4.8.0-dev.17) (2024-05-12)
+
+
+### Features
+
+* **Photomath:** Support version `8.37.0` ([#3109](https://github.com/ReVanced/revanced-patches/issues/3109)) ([fb02b48](https://github.com/ReVanced/revanced-patches/commit/fb02b481e2be8c2bc4441dc5b3dc6a9df3a2a379))
+
+# [4.8.0-dev.16](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.15...v4.8.0-dev.16) (2024-05-12)
+
+
+### Features
+
+* **WarnWetter - Promo code unlock:** Constrain to last working version ([#3110](https://github.com/ReVanced/revanced-patches/issues/3110)) ([92fc8aa](https://github.com/ReVanced/revanced-patches/commit/92fc8aaad80f8fad35b75e6de032692986211536))
+
+# [4.8.0-dev.15](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.14...v4.8.0-dev.15) (2024-05-11)
+
+
+### Bug Fixes
+
+* **YouTube - Restore old video quality menu:** Show advanced quality menu in Shorts quality flyout ([#3155](https://github.com/ReVanced/revanced-patches/issues/3155)) ([c2b5bb7](https://github.com/ReVanced/revanced-patches/commit/c2b5bb723416e43a920817f97b9e0ee4ceab4f6b))
+
+# [4.8.0-dev.14](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.13...v4.8.0-dev.14) (2024-05-08)
+
+
+### Bug Fixes
+
+* **YouTube - SponsorBlock:** Show correct segment times if video is over 24 hours in length ([#3138](https://github.com/ReVanced/revanced-patches/issues/3138)) ([6cdf697](https://github.com/ReVanced/revanced-patches/commit/6cdf697e8e47f6d53964497703dbe79fab3b1821))
+
 # [4.8.0-dev.13](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.12...v4.8.0-dev.13) (2024-05-06)


--- a/api/revanced-patches.api
+++ b/api/revanced-patches.api
@@ -487,6 +487,18 @@ public final class app/revanced/patches/photomath/misc/unlock/plus/UnlockPlusPat
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }

+public final class app/revanced/patches/piccomafr/misc/SpoofAndroidDeviceIdPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/piccomafr/misc/SpoofAndroidDeviceIdPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
+public final class app/revanced/patches/piccomafr/tracking/DisableTrackingPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/piccomafr/tracking/DisableTrackingPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+}
+
 public final class app/revanced/patches/pixiv/ads/HideAdsPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/pixiv/ads/HideAdsPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -1619,12 +1631,10 @@ public final class app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDevic
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }

-public final class app/revanced/patches/youtube/misc/fix/playback/ClientSpoofPatch : app/revanced/patches/all/misc/transformation/BaseTransformInstructionsPatch {
-	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/fix/playback/ClientSpoofPatch;
-	public synthetic fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Ljava/lang/Object;
-	public fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Lkotlin/Triple;
-	public synthetic fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/lang/Object;)V
-	public fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Lkotlin/Triple;)V
+public final class app/revanced/patches/youtube/misc/fix/playback/SpoofClientPatch : app/revanced/patcher/patch/BytecodePatch {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/fix/playback/SpoofClientPatch;
+	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
+	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }

 public final class app/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch : app/revanced/patcher/patch/BytecodePatch {
@@ -1639,6 +1649,14 @@ public final class app/revanced/patches/youtube/misc/fix/playback/SpoofSignature
 	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
 }

+public final class app/revanced/patches/youtube/misc/fix/playback/UserAgentClientSpoofPatch : app/revanced/patches/all/misc/transformation/BaseTransformInstructionsPatch {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/fix/playback/UserAgentClientSpoofPatch;
+	public synthetic fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Ljava/lang/Object;
+	public fun filterMap (Lcom/android/tools/smali/dexlib2/iface/ClassDef;Lcom/android/tools/smali/dexlib2/iface/Method;Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;I)Lkotlin/Triple;
+	public synthetic fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Ljava/lang/Object;)V
+	public fun transform (Lapp/revanced/patcher/util/proxy/mutableTypes/MutableMethod;Lkotlin/Triple;)V
+}
+
 public final class app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch : app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportPatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch;
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.8.0-dev.13
+version = 4.8.0-dev.24
--- a/src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/premium/fingerprints/HideGetPremiumFingerprint.kt
@@ -12,8 +12,6 @@ internal object HideGetPremiumFingerprint : MethodFingerprint(
    listOf(
        Opcode.IF_NEZ,
        Opcode.CONST_16,
-        Opcode.GOTO,
-        Opcode.NOP,
        Opcode.INVOKE_VIRTUAL,
    ),
    listOf("FEmusic_history", "FEmusic_offline"),
--- a/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/fingerprints/PivotBarConstructorFingerprint.kt
@@ -13,7 +13,6 @@ internal object PivotBarConstructorFingerprint : MethodFingerprint(
        Opcode.CHECK_CAST,
        Opcode.INVOKE_INTERFACE,
        Opcode.GOTO,
-        Opcode.NOP,
        Opcode.IPUT_OBJECT,
        Opcode.RETURN_VOID,
    ),
--- a/src/main/kotlin/app/revanced/patches/music/misc/integrations/fingerprints/ApplicationInitFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/music/misc/integrations/fingerprints/ApplicationInitFingerprint.kt
@@ -1,19 +1,10 @@
 package app.revanced.patches.music.misc.integrations.fingerprints

 import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch.IntegrationsFingerprint
-import com.android.tools.smali.dexlib2.Opcode

 internal object ApplicationInitFingerprint : IntegrationsFingerprint(
    returnType = "V",
    parameters = emptyList(),
-    opcodes = listOf(
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.INVOKE_VIRTUAL
-    ),
    strings = listOf("activity"),
    customFingerprint = { methodDef, _ -> methodDef.name == "onCreate" },
 )
--- a/src/main/kotlin/app/revanced/patches/photomath/detection/deviceid/SpoofDeviceIdPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/detection/deviceid/SpoofDeviceIdPatch.kt
@@ -14,7 +14,7 @@ import kotlin.random.Random
    name = "Spoof device ID",
    description = "Spoofs device ID to mitigate manual bans by developers.",
    dependencies = [SignatureDetectionPatch::class],
-    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.32.0"])]
+    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.37.0"])]
 )
@Suppress("unused")
 object SpoofDeviceIdPatch : BytecodePatch(
--- a/src/main/kotlin/app/revanced/patches/photomath/detection/deviceid/fingerprints/GetDeviceIdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/detection/deviceid/fingerprints/GetDeviceIdFingerprint.kt
@@ -1,9 +1,21 @@
 package app.revanced.patches.photomath.detection.deviceid.fingerprints

 import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode

 internal object GetDeviceIdFingerprint : MethodFingerprint(
    returnType = "Ljava/lang/String;",
-    strings = listOf("androidId", "android_id"),
+    opcodes = listOf(
+        Opcode.SGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+    ),
    parameters = listOf()
 )
--- a/src/main/kotlin/app/revanced/patches/photomath/detection/signature/fingerprints/CheckSignatureFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/detection/signature/fingerprints/CheckSignatureFingerprint.kt
@@ -5,11 +5,9 @@ import com.android.tools.smali.dexlib2.Opcode

 internal object CheckSignatureFingerprint : MethodFingerprint(
    strings = listOf(
-        "packageInfo.signatures",
-        "currentSignature"
+        "signatures",
    ),
    opcodes = listOf(
-        Opcode.CONST_STRING,
        Opcode.CONST_STRING,
        Opcode.INVOKE_STATIC,
        Opcode.INVOKE_STATIC,
--- a/src/main/kotlin/app/revanced/patches/photomath/misc/annoyances/HideUpdatePopupPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/misc/annoyances/HideUpdatePopupPatch.kt
@@ -13,7 +13,7 @@ import app.revanced.util.exception
    name = "Hide update popup",
    description = "Prevents the update popup from showing up.",
    dependencies = [SignatureDetectionPatch::class],
-    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.32.0"])]
+    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.37.0"])]
 )
@Suppress("unused")
 object HideUpdatePopupPatch : BytecodePatch(
--- a/src/main/kotlin/app/revanced/patches/photomath/misc/unlock/plus/UnlockPlusPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/photomath/misc/unlock/plus/UnlockPlusPatch.kt
@@ -13,7 +13,7 @@ import app.revanced.patches.photomath.misc.unlock.plus.fingerprints.IsPlusUnlock
@Patch(
    name = "Unlock plus",
    dependencies = [SignatureDetectionPatch::class, EnableBookpointPatch::class],
-    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.32.0"])]
+    compatiblePackages = [CompatiblePackage("com.microblink.photomath", ["8.37.0"])]
 )
@Suppress("unused")
 object UnlockPlusPatch : BytecodePatch(
--- a/src/main/kotlin/app/revanced/patches/piccomafr/misc/SpoofAndroidDeviceIdPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/piccomafr/misc/SpoofAndroidDeviceIdPatch.kt
@@ -0,0 +1,59 @@
+package app.revanced.patches.piccomafr.misc
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
+import app.revanced.patches.piccomafr.misc.fingerprints.GetAndroidIDFingerprint
+import app.revanced.util.exception
+
+@Patch(
+    name = "Spoof Android device ID",
+    description = "Spoofs the Android device ID used by the app for account authentication." +
+        "This can be used to copy the account to another device.",
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.piccomaeurope.fr",
+            [
+                "6.4.0",
+                "6.4.1",
+                "6.4.2",
+                "6.4.3",
+                "6.4.4",
+                "6.4.5",
+                "6.5.0",
+                "6.5.1",
+                "6.5.2",
+                "6.5.3",
+                "6.5.4",
+                "6.6.0",
+                "6.6.1",
+                "6.6.2",
+            ],
+        ),
+    ],
+    use = false,
+)
+@Suppress("unused")
+object SpoofAndroidDeviceIdPatch : BytecodePatch(
+    setOf(GetAndroidIDFingerprint),
+) {
+    private var androidDeviceId =
+        stringPatchOption(
+            key = "android-device-id",
+            default = "0011223344556677",
+            title = "Android device ID",
+            description = "The Android device ID to spoof to.",
+            required = true,
+        ) { it!!.matches("[A-Fa-f0-9]{16}".toRegex()) }
+
+    override fun execute(context: BytecodeContext) = GetAndroidIDFingerprint.result?.mutableMethod?.addInstructions(
+        0,
+        """
+            const-string v0, "$androidDeviceId"
+            return-object v0
+        """,
+    ) ?: throw GetAndroidIDFingerprint.exception
+}
--- a/src/main/kotlin/app/revanced/patches/piccomafr/misc/fingerprints/GetAndroidIDFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/piccomafr/misc/fingerprints/GetAndroidIDFingerprint.kt
@@ -0,0 +1,16 @@
+package app.revanced.patches.piccomafr.misc.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+
+internal object GetAndroidIDFingerprint : MethodFingerprint(
+    parameters = listOf("Landroid/content/Context"),
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    strings = listOf(
+        "context",
+        "android_id"
+    ),
+    returnType = "Ljava/lang/String"
+)
--- a/src/main/kotlin/app/revanced/patches/piccomafr/tracking/DisableTrackingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/piccomafr/tracking/DisableTrackingPatch.kt
@@ -0,0 +1,80 @@
+package app.revanced.patches.piccomafr.tracking
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.piccomafr.tracking.fingerprints.AppMesurementFingerprint
+import app.revanced.patches.piccomafr.tracking.fingerprints.FacebookSDKFingerprint
+import app.revanced.patches.piccomafr.tracking.fingerprints.FirebaseInstallFingerprint
+import app.revanced.util.exception
+import app.revanced.util.getReference
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.StringReference
+
+@Patch(
+    name = "Disable tracking",
+    description = "Disables tracking by replacing tracking URLs with example.com.",
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.piccomaeurope.fr",
+            [
+                "6.4.0",
+                "6.4.1",
+                "6.4.2",
+                "6.4.3",
+                "6.4.4",
+                "6.4.5",
+                "6.5.0",
+                "6.5.1",
+                "6.5.2",
+                "6.5.3",
+                "6.5.4",
+                "6.6.0",
+                "6.6.1",
+                "6.6.2",
+            ],
+        ),
+    ],
+)
+@Suppress("unused")
+object DisableTrackingPatch : BytecodePatch(
+    setOf(FacebookSDKFingerprint, FirebaseInstallFingerprint, AppMesurementFingerprint),
+) {
+    override fun execute(context: BytecodeContext) {
+        FacebookSDKFingerprint.result?.mutableMethod?.apply {
+            getInstructions().filter { instruction ->
+                instruction.opcode == Opcode.CONST_STRING
+            }.forEach { instruction ->
+                instruction as OneRegisterInstruction
+
+                replaceInstruction(
+                    instruction.location.index,
+                    "const-string v${instruction.registerA}, \"example.com\"",
+                )
+            }
+        } ?: throw FacebookSDKFingerprint.exception
+
+        FirebaseInstallFingerprint.result?.mutableMethod?.apply {
+            getInstructions().filter {
+                it.opcode == Opcode.CONST_STRING
+            }.filter {
+                it.getReference<StringReference>()?.string == "firebaseinstallations.googleapis.com"
+            }.forEach { instruction ->
+                instruction as OneRegisterInstruction
+
+                replaceInstruction(
+                    instruction.location.index,
+                    "const-string v${instruction.registerA}, \"example.com\"",
+                )
+            }
+        } ?: throw FirebaseInstallFingerprint.exception
+
+        AppMesurementFingerprint.result?.mutableMethod?.addInstruction(0, "return-void")
+            ?: throw AppMesurementFingerprint.exception
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/piccomafr/tracking/fingerprints/AppMesurementFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/piccomafr/tracking/fingerprints/AppMesurementFingerprint.kt
@@ -0,0 +1,15 @@
+package app.revanced.patches.piccomafr.tracking.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+
+internal object AppMesurementFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
+    strings = listOf(
+        "config/app/",
+        "Fetching remote configuration"
+    ),
+    returnType = "V"
+)
--- a/src/main/kotlin/app/revanced/patches/piccomafr/tracking/fingerprints/FacebookSDKFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/piccomafr/tracking/fingerprints/FacebookSDKFingerprint.kt
@@ -0,0 +1,15 @@
+package app.revanced.patches.piccomafr.tracking.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+
+internal object FacebookSDKFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.STATIC or AccessFlags.CONSTRUCTOR,
+    strings = listOf(
+        "instagram.com",
+        "facebook.com"
+    ),
+    returnType = "V"
+)
--- a/src/main/kotlin/app/revanced/patches/piccomafr/tracking/fingerprints/FirebaseInstallFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/piccomafr/tracking/fingerprints/FirebaseInstallFingerprint.kt
@@ -0,0 +1,13 @@
+package app.revanced.patches.piccomafr.tracking.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+
+internal object FirebaseInstallFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PRIVATE.value,
+    strings = listOf(
+        "https://%s/%s/%s",
+        "firebaseinstallations.googleapis.com"
+    )
+)
--- a/src/main/kotlin/app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch.kt
@@ -8,6 +8,7 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch.IntegrationsFingerprint.IRegisterResolver
 import app.revanced.patches.shared.misc.integrations.fingerprints.ReVancedUtilsPatchesVersionFingerprint
+import app.revanced.util.exception
 import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.ClassDef
@@ -139,7 +140,7 @@ abstract class BaseIntegrationsPatch(
                    "invoke-static/range { v$contextRegister .. v$contextRegister }, " +
                        "$integrationsDescriptor->setContext(Landroid/content/Context;)V",
                )
-            } ?: throw PatchException("Could not find hook target fingerprint.")
+            } ?: throw this.exception
        }

        interface IHookInsertIndexResolver : (Method) -> Int {
--- a/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/PromoCodeUnlockPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/warnwetter/misc/promocode/PromoCodeUnlockPatch.kt
@@ -12,7 +12,7 @@ import app.revanced.patches.warnwetter.misc.promocode.fingerprints.PromoCodeUnlo
    name = "Promo code unlock",
    description = "Disables the validation of promo code. Any code will work to unlock all features.",
    dependencies = [FirebaseGetCertPatch::class],
-    compatiblePackages = [CompatiblePackage("de.dwd.warnapp")]
+    compatiblePackages = [CompatiblePackage("de.dwd.warnapp", ["4.2.2"])]
 )
@Suppress("unused")
 object PromoCodeUnlockPatch : BytecodePatch(
@@ -28,4 +28,4 @@ object PromoCodeUnlockPatch : BytecodePatch(
            """
        )
    }
-}
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt
@@ -1,6 +1,7 @@
 package app.revanced.patches.youtube.layout.buttons.navigation

 import app.revanced.patcher.data.BytecodeContext
+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.patch.BytecodePatch
@@ -12,11 +13,16 @@ import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen.Sor
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.youtube.layout.buttons.navigation.fingerprints.ANDROID_AUTOMOTIVE_STRING
 import app.revanced.patches.youtube.layout.buttons.navigation.fingerprints.AddCreateButtonViewFingerprint
+import app.revanced.patches.youtube.layout.buttons.navigation.fingerprints.CreatePivotBarFingerprint
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.navigation.NavigationBarHookPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.util.exception
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference

@Patch(
    name = "Navigation buttons",
@@ -49,14 +55,17 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                "19.08.36",
                "19.09.38",
                "19.10.39",
-                "19.11.43"
+                "19.11.43",
            ],
        ),
    ],
 )
@Suppress("unused")
 object NavigationButtonsPatch : BytecodePatch(
-    setOf(AddCreateButtonViewFingerprint),
+    setOf(
+        AddCreateButtonViewFingerprint,
+        CreatePivotBarFingerprint,
+    ),
 ) {
    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
        "Lapp/revanced/integrations/youtube/patches/NavigationButtonsPatch;"
@@ -74,6 +83,7 @@ object NavigationButtonsPatch : BytecodePatch(
                    SwitchPreference("revanced_hide_create_button"),
                    SwitchPreference("revanced_hide_subscriptions_button"),
                    SwitchPreference("revanced_switch_create_with_notifications_button"),
+                    SwitchPreference("revanced_hide_navigation_button_labels"),
                ),
            ),
        )
@@ -99,6 +109,21 @@ object NavigationButtonsPatch : BytecodePatch(
            }
        } ?: throw AddCreateButtonViewFingerprint.exception

+        // Hide navigation button labels.
+        CreatePivotBarFingerprint.result?.mutableMethod?.apply {
+            val setTextIndex = indexOfFirstInstruction {
+                getReference<MethodReference>()?.name == "setText"
+            }
+
+            val targetRegister = getInstruction<FiveRegisterInstruction>(setTextIndex).registerC
+
+            addInstruction(
+                setTextIndex,
+                "invoke-static { v$targetRegister }, " +
+                    "$INTEGRATIONS_CLASS_DESCRIPTOR->hideNavigationButtonLabels(Landroid/widget/TextView;)V",
+            )
+        } ?: throw CreatePivotBarFingerprint.exception
+
        // Hook navigation button created, in order to hide them.
        NavigationBarHookPatch.hookNavigationButtonCreated(INTEGRATIONS_CLASS_DESCRIPTOR)
    }
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/CreatePivotBarFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/fingerprints/CreatePivotBarFingerprint.kt
@@ -0,0 +1,20 @@
+package app.revanced.patches.youtube.layout.buttons.navigation.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object CreatePivotBarFingerprint : MethodFingerprint(
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    parameters = listOf(
+        "Lcom/google/android/libraries/youtube/rendering/ui/pivotbar/PivotBar;",
+        "Landroid/widget/TextView;",
+        "Ljava/lang/CharSequence;",
+    ),
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.RETURN_VOID,
+    ),
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt
@@ -41,6 +41,7 @@ object HideShortsComponentsResourcePatch : ResourcePatch() {
            SwitchPreference("revanced_hide_shorts_shop_button"),
            SwitchPreference("revanced_hide_shorts_tagged_products"),
            SwitchPreference("revanced_hide_shorts_search_suggestions"),
+            SwitchPreference("revanced_hide_shorts_super_thanks_button"),
            SwitchPreference("revanced_hide_shorts_location_label"),
            SwitchPreference("revanced_hide_shorts_channel_bar"),
            SwitchPreference("revanced_hide_shorts_info_panel"),
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofClientPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofClientPatch.kt
@@ -0,0 +1,335 @@
+package app.revanced.patches.youtube.misc.fix.playback
+
+import app.revanced.patcher.data.BytecodeContext
+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.getInstructions
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import app.revanced.patches.all.misc.resources.AddResourcesPatch
+import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen
+import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen.Sorting
+import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
+import app.revanced.patches.youtube.misc.fix.playback.fingerprints.*
+import app.revanced.patches.youtube.misc.settings.SettingsPatch
+import app.revanced.patches.youtube.video.playerresponse.PlayerResponseMethodHookPatch
+import app.revanced.util.getReference
+import app.revanced.util.resultOrThrow
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+import com.android.tools.smali.dexlib2.iface.reference.TypeReference
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter
+
+@Patch(
+    name = "Spoof client",
+    description = "Spoofs the client to allow video playback.",
+    dependencies = [
+        SpoofClientResourcePatch::class,
+        PlayerResponseMethodHookPatch::class,
+        SettingsPatch::class,
+        AddResourcesPatch::class,
+        UserAgentClientSpoofPatch::class,
+        PlayerResponseMethodHookPatch::class,
+    ],
+    compatiblePackages = [
+        CompatiblePackage(
+            "com.google.android.youtube",
+            [
+                "18.37.36",
+                "18.38.44",
+                "18.43.45",
+                "18.44.41",
+                "18.45.43",
+                "18.48.39",
+                "18.49.37",
+                "19.01.34",
+                "19.02.39",
+                "19.03.36",
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.38",
+                "19.10.39",
+                "19.11.43",
+            ],
+        ),
+    ],
+)
+object SpoofClientPatch : BytecodePatch(
+    setOf(
+        // Client type spoof.
+        BuildInitPlaybackRequestFingerprint,
+        BuildPlayerRequestURIFingerprint,
+        SetPlayerRequestClientTypeFingerprint,
+        CreatePlayerRequestBodyFingerprint,
+
+        // Storyboard spoof.
+        StoryboardRendererSpecFingerprint,
+        PlayerResponseModelImplRecommendedLevelFingerprint,
+        StoryboardRendererDecoderRecommendedLevelFingerprint,
+        PlayerResponseModelImplGeneralFingerprint,
+        StoryboardRendererDecoderSpecFingerprint,
+    ),
+) {
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
+        "Lapp/revanced/integrations/youtube/patches/spoof/SpoofClientPatch;"
+    private const val CLIENT_INFO_CLASS_DESCRIPTOR =
+        "Lcom/google/protos/youtube/api/innertube/InnertubeContext\$ClientInfo;"
+
+    override fun execute(context: BytecodeContext) {
+        AddResourcesPatch(this::class)
+
+        SettingsPatch.PreferenceScreen.MISC.addPreferences(
+            PreferenceScreen(
+                key = "revanced_spoof_client_screen",
+                sorting = Sorting.UNSORTED,
+                preferences = setOf(
+                    SwitchPreference("revanced_spoof_client"),
+                    SwitchPreference("revanced_spoof_client_use_ios"),
+                ),
+            ),
+
+        )
+
+        // region Block /initplayback requests to fall back to /get_watch requests.
+
+        BuildInitPlaybackRequestFingerprint.resultOrThrow().let {
+            val moveUriStringIndex = it.scanResult.patternScanResult!!.startIndex
+
+            it.mutableMethod.apply {
+                val targetRegister = getInstruction<OneRegisterInstruction>(moveUriStringIndex).registerA
+
+                addInstructions(
+                    moveUriStringIndex + 1,
+                    """
+                        invoke-static { v$targetRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->blockInitPlaybackRequest(Ljava/lang/String;)Ljava/lang/String;
+                        move-result-object v$targetRegister
+                    """,
+                )
+            }
+        }
+
+        // endregion
+
+        // region Block /get_watch requests to fall back to /player requests.
+
+        BuildPlayerRequestURIFingerprint.resultOrThrow().let {
+            val invokeToStringIndex = it.scanResult.patternScanResult!!.startIndex
+
+            it.mutableMethod.apply {
+                val uriRegister = getInstruction<FiveRegisterInstruction>(invokeToStringIndex).registerC
+
+                addInstructions(
+                    invokeToStringIndex,
+                    """
+                        invoke-static { v$uriRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->blockGetWatchRequest(Landroid/net/Uri;)Landroid/net/Uri;
+                        move-result-object v$uriRegister
+                    """,
+                )
+            }
+        }
+
+        // endregion
+
+        // region Get field references to be used below.
+
+        val (clientInfoField, clientInfoClientTypeField, clientInfoClientVersionField) =
+            SetPlayerRequestClientTypeFingerprint.resultOrThrow().let { result ->
+                // Field in the player request object that holds the client info object.
+                val clientInfoField = result.mutableMethod
+                    .getInstructions().first { instruction ->
+                        // requestMessage.clientInfo = clientInfoBuilder.build();
+                        instruction.opcode == Opcode.IPUT_OBJECT &&
+                            instruction.getReference<FieldReference>()?.type == CLIENT_INFO_CLASS_DESCRIPTOR
+                    }.getReference<FieldReference>() ?: throw PatchException("Could not find clientInfoField")
+
+                // Client info object's client type field.
+                val clientInfoClientTypeField = result.mutableMethod
+                    .getInstruction(result.scanResult.patternScanResult!!.endIndex)
+                    .getReference<FieldReference>() ?: throw PatchException("Could not find clientInfoClientTypeField")
+
+                // Client info object's client version field.
+                val clientInfoClientVersionField = result.mutableMethod
+                    .getInstruction(result.scanResult.stringsScanResult!!.matches.first().index + 1)
+                    .getReference<FieldReference>() ?: throw PatchException("Could not find clientInfoClientVersionField")
+
+                Triple(clientInfoField, clientInfoClientTypeField, clientInfoClientVersionField)
+            }
+
+        // endregion
+
+        // region Spoof client type for /player requests.
+
+        CreatePlayerRequestBodyFingerprint.resultOrThrow().let { result ->
+            val setClientInfoMethodName = "patch_setClientInfo"
+            val checkCastIndex = result.scanResult.patternScanResult!!.startIndex
+            var clientInfoContainerClassName: String
+
+            result.mutableMethod.apply {
+                val checkCastInstruction = getInstruction<OneRegisterInstruction>(checkCastIndex)
+                val requestMessageInstanceRegister = checkCastInstruction.registerA
+                clientInfoContainerClassName = checkCastInstruction.getReference<TypeReference>()!!.type
+
+                addInstruction(
+                    checkCastIndex + 1,
+                    "invoke-static { v$requestMessageInstanceRegister }," +
+                        " ${result.classDef.type}->$setClientInfoMethodName($clientInfoContainerClassName)V",
+                )
+            }
+
+            // Change requestMessage.clientInfo.clientType and requestMessage.clientInfo.clientVersion to the spoofed values.
+            // Do this in a helper method, to remove the need of picking out multiple free registers from the hooked code.
+            result.mutableClass.methods.add(
+                ImmutableMethod(
+                    result.mutableClass.type,
+                    setClientInfoMethodName,
+                    listOf(ImmutableMethodParameter(clientInfoContainerClassName, null, "clientInfoContainer")),
+                    "V",
+                    AccessFlags.PRIVATE or AccessFlags.STATIC,
+                    null,
+                    null,
+                    MutableMethodImplementation(3),
+                ).toMutable().apply {
+                    addInstructions(
+                        """
+                            invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->isClientSpoofingEnabled()Z
+                            move-result v0
+                            if-eqz v0, :disabled
+                            
+                            iget-object v0, p0, $clientInfoField
+                            
+                            # Set client type to the spoofed value.
+                            iget v1, v0, $clientInfoClientTypeField
+                            invoke-static { v1 }, $INTEGRATIONS_CLASS_DESCRIPTOR->getClientTypeId(I)I
+                            move-result v1
+                            iput v1, v0, $clientInfoClientTypeField
+                            
+                            # Set client version to the spoofed value.
+                            iget-object v1, v0, $clientInfoClientVersionField
+                            invoke-static { v1 }, $INTEGRATIONS_CLASS_DESCRIPTOR->getClientVersion(Ljava/lang/String;)Ljava/lang/String;
+                            move-result-object v1
+                            iput-object v1, v0, $clientInfoClientVersionField
+                            
+                            :disabled
+                            return-void
+                        """,
+                    )
+                },
+            )
+        }
+
+        // endregion
+
+        // region Fix storyboard if Android Testsuite is used.
+
+        PlayerResponseMethodHookPatch += PlayerResponseMethodHookPatch.Hook.ProtoBufferParameter(
+            "$INTEGRATIONS_CLASS_DESCRIPTOR->setPlayerResponseVideoId(" +
+                "Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;",
+        )
+
+        // Hook recommended seekbar thumbnails quality level for regular videos.
+        StoryboardRendererDecoderRecommendedLevelFingerprint.resultOrThrow().let {
+            val endIndex = it.scanResult.patternScanResult!!.endIndex
+
+            it.mutableMethod.apply {
+                val originalValueRegister =
+                    getInstruction<OneRegisterInstruction>(endIndex).registerA
+
+                addInstructions(
+                    endIndex + 1,
+                    """
+                        invoke-static { v$originalValueRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getRecommendedLevel(I)I
+                        move-result v$originalValueRegister
+                    """,
+                )
+            }
+        }
+
+        // Hook the recommended precise seeking thumbnails quality.
+        PlayerResponseModelImplRecommendedLevelFingerprint.resultOrThrow().let {
+            val endIndex = it.scanResult.patternScanResult!!.endIndex
+
+            it.mutableMethod.apply {
+                val originalValueRegister =
+                    getInstruction<OneRegisterInstruction>(endIndex).registerA
+
+                addInstructions(
+                    endIndex,
+                    """
+                        invoke-static { v$originalValueRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getRecommendedLevel(I)I
+                        move-result v$originalValueRegister
+                    """,
+                )
+            }
+        }
+
+        // TODO: Hook the seekbar recommended level for Shorts to fix Shorts low quality seekbar thumbnails.
+
+        /**
+         * Hook StoryBoard renderer url.
+         */
+        PlayerResponseModelImplGeneralFingerprint.resultOrThrow().let {
+            val getStoryBoardIndex = it.scanResult.patternScanResult!!.endIndex
+
+            it.mutableMethod.apply {
+                val getStoryBoardRegister = getInstruction<OneRegisterInstruction>(getStoryBoardIndex).registerA
+
+                addInstructions(
+                    getStoryBoardIndex,
+                    """
+                        invoke-static { v$getStoryBoardRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardRendererSpec(Ljava/lang/String;)Ljava/lang/String;
+                        move-result-object v$getStoryBoardRegister
+                    """,
+                )
+            }
+        }
+
+        // Hook the seekbar thumbnail decoder, required for Shorts.
+        StoryboardRendererDecoderSpecFingerprint.resultOrThrow().let {
+            val storyBoardUrlIndex = it.scanResult.patternScanResult!!.startIndex + 1
+
+            it.mutableMethod.apply {
+                val getStoryBoardRegister = getInstruction<OneRegisterInstruction>(storyBoardUrlIndex).registerA
+
+                addInstructions(
+                    storyBoardUrlIndex + 1,
+                    """
+                        invoke-static { v$getStoryBoardRegister }, ${INTEGRATIONS_CLASS_DESCRIPTOR}->getStoryboardRendererSpec(Ljava/lang/String;)Ljava/lang/String;
+                        move-result-object v$getStoryBoardRegister
+                    """,
+                )
+            }
+        }
+
+        StoryboardRendererSpecFingerprint.resultOrThrow().let {
+            it.mutableMethod.apply {
+                val storyBoardUrlParams = "p0"
+
+                addInstructions(
+                    0,
+                    """
+                        if-nez $storyBoardUrlParams, :ignore
+                        invoke-static { $storyBoardUrlParams }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardRendererSpec(Ljava/lang/String;)Ljava/lang/String;
+                        move-result-object $storyBoardUrlParams
+                        :ignore
+                        nop
+                    """,
+                )
+            }
+        }
+
+        // endregion
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofClientResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofClientResourcePatch.kt
@@ -0,0 +1,18 @@
+package app.revanced.patches.youtube.misc.fix.playback
+
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
+
+@Patch(dependencies = [ResourceMappingPatch::class])
+internal object SpoofClientResourcePatch : ResourcePatch() {
+    internal var scrubbedPreviewThumbnailResourceId: Long = -1
+
+    override fun execute(context: ResourceContext) {
+        scrubbedPreviewThumbnailResourceId = ResourceMappingPatch[
+            "id",
+            "thumbnail",
+        ]
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch.kt
@@ -68,7 +68,7 @@ object SpoofSignaturePatch : BytecodePatch(

        // Hook the player parameters.
        PlayerResponseMethodHookPatch += PlayerResponseMethodHookPatch.Hook.ProtoBufferParameter(
-            "$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;Z)Ljava/lang/String;",
+            "$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;",
        )

        // Force the seekbar time and chapters to always show up.
@@ -104,7 +104,7 @@ object SpoofSignaturePatch : BytecodePatch(
        }

        // If storyboard spoofing is turned off, then hide the empty seekbar thumbnail view.
-        ScrubbedPreviewLayoutFingerprint.result?.apply {
+        SpoofSignaturePatchScrubbedPreviewLayoutFingerprint.result?.apply {
            val endIndex = scanResult.patternScanResult!!.endIndex
            mutableMethod.apply {
                val imageViewFieldName = getInstruction<ReferenceInstruction>(endIndex).reference
@@ -116,7 +116,7 @@ object SpoofSignaturePatch : BytecodePatch(
                    """,
                )
            }
-        } ?: throw ScrubbedPreviewLayoutFingerprint.exception
+        } ?: throw SpoofSignaturePatchScrubbedPreviewLayoutFingerprint.exception

        /**
         * Hook StoryBoard renderer url
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignatureResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignatureResourcePatch.kt
@@ -4,9 +4,9 @@ import app.revanced.patcher.data.ResourceContext
 import app.revanced.patcher.patch.ResourcePatch
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
-import app.revanced.patches.youtube.misc.settings.SettingsPatch

-@Patch(dependencies = [SettingsPatch::class, ResourceMappingPatch::class])
+@Patch(dependencies = [ResourceMappingPatch::class])
+@Deprecated("This patch will be removed in the future.")
 object SpoofSignatureResourcePatch : ResourcePatch() {
    internal var scrubbedPreviewThumbnailResourceId: Long = -1

--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/UserAgentClientSpoofPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/UserAgentClientSpoofPatch.kt
@@ -2,8 +2,6 @@ package app.revanced.patches.youtube.misc.fix.playback

 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.all.misc.transformation.BaseTransformInstructionsPatch
 import app.revanced.patches.all.misc.transformation.IMethodCall
@@ -16,14 +14,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference

-@Patch(
-    name = "Client spoof",
-    description = "Spoofs the client to allow video playback.",
-    compatiblePackages = [
-        CompatiblePackage("com.google.android.youtube"),
-    ],
-)
-object ClientSpoofPatch : BaseTransformInstructionsPatch<Instruction35cInfo>() {
+object UserAgentClientSpoofPatch : BaseTransformInstructionsPatch<Instruction35cInfo>() {
    private const val ORIGINAL_PACKAGE_NAME = "com.google.android.youtube"
    private const val USER_AGENT_STRING_BUILDER_APPEND_METHOD_REFERENCE =
        "Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;"
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/BuildInitPlaybackRequestFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/BuildInitPlaybackRequestFingerprint.kt
@@ -0,0 +1,16 @@
+package app.revanced.patches.youtube.misc.fix.playback.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object BuildInitPlaybackRequestFingerprint : MethodFingerprint(
+    returnType = "Lorg/chromium/net/UrlRequest\$Builder;",
+    opcodes = listOf(
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IGET_OBJECT, // Moves the request URI string to a register to build the request with.
+    ),
+    strings = listOf(
+        "Content-Type",
+        "Range",
+    ),
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/BuildPlayerRequestURIFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/BuildPlayerRequestURIFingerprint.kt
@@ -0,0 +1,21 @@
+package app.revanced.patches.youtube.misc.fix.playback.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object BuildPlayerRequestURIFingerprint : MethodFingerprint(
+    returnType = "Ljava/lang/String;",
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL, // Register holds player request URI.
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.MONITOR_EXIT,
+        Opcode.RETURN_OBJECT,
+    ),
+    strings = listOf(
+        "youtubei/v1",
+        "key",
+        "asig",
+    ),
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/CreatePlayerRequestBodyFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/CreatePlayerRequestBodyFingerprint.kt
@@ -0,0 +1,15 @@
+package app.revanced.patches.youtube.misc.fix.playback.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object CreatePlayerRequestBodyFingerprint : MethodFingerprint(
+    returnType = "V",
+    parameters = listOf("L"),
+    opcodes = listOf(
+        Opcode.CHECK_CAST,
+        Opcode.IGET,
+        Opcode.AND_INT_LIT16,
+    ),
+    strings = listOf("ms"),
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplGeneralFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplGeneralFingerprint.kt
@@ -1,8 +1,8 @@
 package app.revanced.patches.youtube.misc.fix.playback.fingerprints

-import app.revanced.util.containsWideLiteralInstructionValue
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.util.containsWideLiteralInstructionValue
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -13,11 +13,11 @@ internal object PlayerResponseModelImplGeneralFingerprint : MethodFingerprint(
    opcodes = listOf(
        Opcode.RETURN_OBJECT,
        Opcode.CONST_4,
-        Opcode.RETURN_OBJECT
+        Opcode.RETURN_OBJECT,
    ),
    customFingerprint = handler@{ methodDef, _ ->
        if (!methodDef.definingClass.endsWith("/PlayerResponseModelImpl;")) return@handler false

        methodDef.containsWideLiteralInstructionValue(55735497)
-    }
-)
+    },
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplLiveStreamFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplLiveStreamFingerprint.kt
@@ -1,8 +1,8 @@
 package app.revanced.patches.youtube.misc.fix.playback.fingerprints

-import app.revanced.util.containsWideLiteralInstructionValue
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.util.containsWideLiteralInstructionValue
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -13,11 +13,11 @@ internal object PlayerResponseModelImplLiveStreamFingerprint : MethodFingerprint
    opcodes = listOf(
        Opcode.RETURN_OBJECT,
        Opcode.CONST_4,
-        Opcode.RETURN_OBJECT
+        Opcode.RETURN_OBJECT,
    ),
    customFingerprint = handler@{ methodDef, _ ->
        if (!methodDef.definingClass.endsWith("/PlayerResponseModelImpl;")) return@handler false

        methodDef.containsWideLiteralInstructionValue(70276274)
-    }
+    },
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplRecommendedLevelFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplRecommendedLevelFingerprint.kt
@@ -1,8 +1,8 @@
 package app.revanced.patches.youtube.misc.fix.playback.fingerprints

-import app.revanced.util.containsWideLiteralInstructionValue
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.util.containsWideLiteralInstructionValue
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -13,11 +13,11 @@ internal object PlayerResponseModelImplRecommendedLevelFingerprint : MethodFinge
    opcodes = listOf(
        Opcode.SGET_OBJECT,
        Opcode.IGET,
-        Opcode.RETURN
+        Opcode.RETURN,
    ),
    customFingerprint = handler@{ methodDef, _ ->
        if (!methodDef.definingClass.endsWith("/PlayerResponseModelImpl;")) return@handler false

        methodDef.containsWideLiteralInstructionValue(55735497)
-    }
-)
+    },
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ScrubbedPreviewLayoutFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ScrubbedPreviewLayoutFingerprint.kt
@@ -1,7 +1,7 @@
 package app.revanced.patches.youtube.misc.fix.playback.fingerprints

 import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.misc.fix.playback.SpoofSignatureResourcePatch
+import app.revanced.patches.youtube.misc.fix.playback.SpoofClientResourcePatch
 import app.revanced.util.patch.LiteralValueFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
@@ -23,5 +23,5 @@ internal object ScrubbedPreviewLayoutFingerprint : LiteralValueFingerprint(
        Opcode.IPUT_OBJECT, // preview imageview
    ),
    // This resource is used in ~ 40 different locations, but this method has a distinct list of parameters to match to.
-    literalSupplier = { SpoofSignatureResourcePatch.scrubbedPreviewThumbnailResourceId }
-)
+    literalSupplier = { SpoofClientResourcePatch.scrubbedPreviewThumbnailResourceId },
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/SetPlayerRequestClientTypeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/SetPlayerRequestClientTypeFingerprint.kt
@@ -0,0 +1,12 @@
+package app.revanced.patches.youtube.misc.fix.playback.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object SetPlayerRequestClientTypeFingerprint : MethodFingerprint(
+    strings = listOf("10.29"),
+    opcodes = listOf(
+        Opcode.IGET,
+        Opcode.IPUT, // Sets ClientInfo.clientId.
+    ),
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/SpoofSignaturePatchScrubbedPreviewLayoutFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/SpoofSignaturePatchScrubbedPreviewLayoutFingerprint.kt
@@ -0,0 +1,27 @@
+package app.revanced.patches.youtube.misc.fix.playback.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patches.youtube.misc.fix.playback.SpoofSignatureResourcePatch
+import app.revanced.util.patch.LiteralValueFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object SpoofSignaturePatchScrubbedPreviewLayoutFingerprint : LiteralValueFingerprint(
+    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
+    returnType = "V",
+    parameters = listOf("Landroid/content/Context;", "Landroid/util/AttributeSet;", "I", "I"),
+    opcodes = listOf(
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.CONST,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CHECK_CAST,
+        Opcode.IPUT_OBJECT, // preview imageview
+    ),
+    // This resource is used in ~ 40 different locations, but this method has a distinct list of parameters to match to.
+    literalSupplier = { SpoofSignatureResourcePatch.scrubbedPreviewThumbnailResourceId },
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardRendererDecoderRecommendedLevelFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardRendererDecoderRecommendedLevelFingerprint.kt
@@ -17,7 +17,7 @@ internal object StoryboardRendererDecoderRecommendedLevelFingerprint : MethodFin
        Opcode.MOVE_RESULT_OBJECT,
        Opcode.IPUT_OBJECT,
        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT
+        Opcode.MOVE_RESULT,
    ),
-    strings = listOf("#-1#")
+    strings = listOf("#-1#"),
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardRendererDecoderSpecFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardRendererDecoderSpecFingerprint.kt
@@ -6,8 +6,8 @@ import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

 /**
-* Resolves to the same method as [StoryboardRendererDecoderRecommendedLevelFingerprint].
-*/
+ * Resolves to the same method as [StoryboardRendererDecoderRecommendedLevelFingerprint].
+ */
 internal object StoryboardRendererDecoderSpecFingerprint : MethodFingerprint(
    returnType = "V",
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
@@ -19,5 +19,5 @@ internal object StoryboardRendererDecoderSpecFingerprint : MethodFingerprint(
        Opcode.CONST_4,
        Opcode.IF_NEZ,
    ),
-    strings = listOf("#-1#")
+    strings = listOf("#-1#"),
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardThumbnailParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardThumbnailParentFingerprint.kt
@@ -14,4 +14,4 @@ internal object StoryboardThumbnailParentFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    returnType = "Landroid/graphics/Bitmap;",
    strings = listOf("Storyboard regionDecoder.decodeRegion exception - "),
-)
+)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt
@@ -3,7 +3,7 @@ package app.revanced.patches.youtube.misc.gms
 import app.revanced.patches.shared.fingerprints.CastContextFetchFingerprint
 import app.revanced.patches.shared.misc.gms.BaseGmsCoreSupportPatch
 import app.revanced.patches.youtube.layout.buttons.cast.HideCastButtonPatch
-import app.revanced.patches.youtube.misc.fix.playback.ClientSpoofPatch
+import app.revanced.patches.youtube.misc.fix.playback.SpoofClientPatch
 import app.revanced.patches.youtube.misc.gms.Constants.REVANCED_YOUTUBE_PACKAGE_NAME
 import app.revanced.patches.youtube.misc.gms.Constants.YOUTUBE_PACKAGE_NAME
 import app.revanced.patches.youtube.misc.gms.GmsCoreSupportResourcePatch.gmsCoreVendorGroupIdOption
@@ -27,13 +27,18 @@ object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
    integrationsPatchDependency = IntegrationsPatch::class,
    dependencies = setOf(
        HideCastButtonPatch::class,
-        ClientSpoofPatch::class,
+        SpoofClientPatch::class,
    ),
    gmsCoreSupportResourcePatch = GmsCoreSupportResourcePatch,
    compatiblePackages = setOf(
        CompatiblePackage(
            "com.google.android.youtube",
            setOf(
+                "18.37.36",
+                "18.38.44",
+                "18.43.45",
+                "18.44.41",
+                "18.45.43",
                "18.48.39",
                "18.49.37",
                "19.01.34",
@@ -46,7 +51,7 @@ object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
                "19.08.36",
                "19.09.38",
                "19.10.39",
-                "19.11.43"
+                "19.11.43",
            ),
        ),
    ),
--- a/src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/information/VideoInformationPatch.kt
@@ -119,7 +119,7 @@ object VideoInformationPatch : BytecodePatch(
        // Call before any other video id hooks,
        // so they can use VideoInformation and check if the video id is for a Short.
        PlayerResponseMethodHookPatch += PlayerResponseMethodHookPatch.Hook.ProtoBufferParameterBeforeVideoId(
-            "$INTEGRATIONS_CLASS_DESCRIPTOR->newPlayerResponseSignature(Ljava/lang/String;Z)Ljava/lang/String;")
+            "$INTEGRATIONS_CLASS_DESCRIPTOR->newPlayerResponseSignature(Ljava/lang/String;Ljava/lang/String;Z)Ljava/lang/String;")

        /*
         * Set the video time method
--- a/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt
@@ -24,24 +24,39 @@ object PlayerResponseMethodHookPatch :
    private const val PARAMETER_PROTO_BUFFER = 3
    private const val PARAMETER_IS_SHORT_AND_OPENING_OR_PLAYING = 11

-    // Temporary 4-bit registers used to pass the parameters to integrations.
-    private const val REGISTER_VIDEO_ID = 0
-    private const val REGISTER_PROTO_BUFFER = 1
-    private const val REGISTER_IS_SHORT_AND_OPENING_OR_PLAYING = 2
+    // Registers used to pass the parameters to integrations.
+    private var playerResponseMethodCopyRegisters = false
+    private lateinit var REGISTER_VIDEO_ID : String
+    private lateinit var REGISTER_PROTO_BUFFER : String
+    private lateinit var REGISTER_IS_SHORT_AND_OPENING_OR_PLAYING : String

    private lateinit var playerResponseMethod: MutableMethod
-
    private var numberOfInstructionsAdded = 0

    override fun execute(context: BytecodeContext) {
        playerResponseMethod = PlayerParameterBuilderFingerprint.result?.mutableMethod
            ?: throw PlayerParameterBuilderFingerprint.exception
+
+        // On some app targets the method has too many registers pushing the parameters past v15.
+        // If needed, move the parameters to 4-bit registers so they can be passed to integrations.
+        playerResponseMethodCopyRegisters = playerResponseMethod.implementation!!.registerCount -
+                playerResponseMethod.parameterTypes.size + PARAMETER_IS_SHORT_AND_OPENING_OR_PLAYING > 15
+
+        if (playerResponseMethodCopyRegisters) {
+            REGISTER_VIDEO_ID = "v0"
+            REGISTER_PROTO_BUFFER = "v1"
+            REGISTER_IS_SHORT_AND_OPENING_OR_PLAYING = "v2"
+        } else {
+            REGISTER_VIDEO_ID = "p$PARAMETER_VIDEO_ID"
+            REGISTER_PROTO_BUFFER = "p$PARAMETER_PROTO_BUFFER"
+            REGISTER_IS_SHORT_AND_OPENING_OR_PLAYING = "p$PARAMETER_IS_SHORT_AND_OPENING_OR_PLAYING"
+        }
    }

    override fun close() {
        fun hookVideoId(hook: Hook) {
            playerResponseMethod.addInstruction(
-                0, "invoke-static {v$REGISTER_VIDEO_ID, v$REGISTER_IS_SHORT_AND_OPENING_OR_PLAYING}, $hook"
+                0, "invoke-static {$REGISTER_VIDEO_ID, $REGISTER_IS_SHORT_AND_OPENING_OR_PLAYING}, $hook"
            )
            numberOfInstructionsAdded++
        }
@@ -50,8 +65,8 @@ object PlayerResponseMethodHookPatch :
            playerResponseMethod.addInstructions(
                0,
                """
-                    invoke-static {v$REGISTER_PROTO_BUFFER, v$REGISTER_IS_SHORT_AND_OPENING_OR_PLAYING}, $hook
-                    move-result-object v$REGISTER_PROTO_BUFFER
+                    invoke-static {$REGISTER_PROTO_BUFFER, $REGISTER_VIDEO_ID, $REGISTER_IS_SHORT_AND_OPENING_OR_PLAYING}, $hook
+                    move-result-object $REGISTER_PROTO_BUFFER
            """
            )
            numberOfInstructionsAdded += 2
@@ -67,22 +82,22 @@ object PlayerResponseMethodHookPatch :
        videoIdHooks.forEach(::hookVideoId)
        beforeVideoIdHooks.forEach(::hookProtoBufferParameter)

-        // On some app targets the method has too many registers pushing the parameters past v15.
-        // Move the parameters to 4-bit registers so they can be passed to integrations.
-        playerResponseMethod.addInstructions(
-            0, """
-                move-object/from16 v$REGISTER_VIDEO_ID, p$PARAMETER_VIDEO_ID
-                move-object/from16 v$REGISTER_PROTO_BUFFER, p$PARAMETER_PROTO_BUFFER
-                move/from16        v$REGISTER_IS_SHORT_AND_OPENING_OR_PLAYING, p$PARAMETER_IS_SHORT_AND_OPENING_OR_PLAYING
+        if (playerResponseMethodCopyRegisters) {
+            playerResponseMethod.addInstructions(
+                0, """
+                move-object/from16 $REGISTER_VIDEO_ID, p$PARAMETER_VIDEO_ID
+                move-object/from16 $REGISTER_PROTO_BUFFER, p$PARAMETER_PROTO_BUFFER
+                move/from16        $REGISTER_IS_SHORT_AND_OPENING_OR_PLAYING, p$PARAMETER_IS_SHORT_AND_OPENING_OR_PLAYING
            """,
-        )
-        numberOfInstructionsAdded += 3
+            )
+            numberOfInstructionsAdded += 3

-        // Move the modified register back.
-        playerResponseMethod.addInstruction(
-            numberOfInstructionsAdded,
-            "move-object/from16 p$PARAMETER_PROTO_BUFFER, v$REGISTER_PROTO_BUFFER"
-        )
+            // Move the modified register back.
+            playerResponseMethod.addInstruction(
+                numberOfInstructionsAdded,
+                "move-object/from16 p$PARAMETER_PROTO_BUFFER, $REGISTER_PROTO_BUFFER"
+            )
+        }
    }

    internal abstract class Hook(private val methodDescriptor: String) {
--- a/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuPatch.kt
@@ -2,14 +2,18 @@ package app.revanced.patches.youtube.video.videoqualitymenu

 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.util.smali.ExternalLabel
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.litho.filter.LithoFilterPatch
 import app.revanced.patches.youtube.misc.recyclerviewtree.hook.RecyclerViewTreeHookPatch
+import app.revanced.patches.youtube.video.videoqualitymenu.fingerprints.VideoQualityMenuOptionsFingerprint
 import app.revanced.patches.youtube.video.videoqualitymenu.fingerprints.VideoQualityMenuViewInflateFingerprint
+import app.revanced.util.resultOrThrow
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch(
@@ -50,7 +54,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 )
@Suppress("unused")
 object RestoreOldVideoQualityMenuPatch : BytecodePatch(
-    setOf(VideoQualityMenuViewInflateFingerprint)
+    setOf(VideoQualityMenuViewInflateFingerprint, VideoQualityMenuOptionsFingerprint)
 ) {
    private const val FILTER_CLASS_DESCRIPTOR =
            "Lapp/revanced/integrations/youtube/patches/components/VideoQualityMenuFilterPatch;"
@@ -60,7 +64,8 @@ object RestoreOldVideoQualityMenuPatch : BytecodePatch(

    override fun execute(context: BytecodeContext) {
        // region Patch for the old type of the video quality menu.
-        // Only used when spoofing to old app version.
+        // Used for regular videos when spoofing to old app version,
+        // and for the Shorts quality flyout on newer app versions.

        VideoQualityMenuViewInflateFingerprint.result?.let {
            it.mutableMethod.apply {
@@ -76,6 +81,29 @@ object RestoreOldVideoQualityMenuPatch : BytecodePatch(
            }
        }

+        // Force YT to add the 'advanced' quality menu for Shorts.
+        VideoQualityMenuOptionsFingerprint.resultOrThrow().let {
+            val result = it.scanResult.patternScanResult!!
+            val startIndex = result.startIndex
+            val endIndex = result.endIndex
+
+            it.mutableMethod.apply {
+                val freeRegister = getInstruction<OneRegisterInstruction>(startIndex).registerA
+
+                // A condition controls whether to show the three or four items quality menu.
+                // Force the four items quality menu to make the "Advanced" item visible, necessary for the patch.
+                addInstructionsWithLabels(
+                    startIndex + 1,
+                    """
+                        invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->forceAdvancedVideoQualityMenuCreation()Z
+                        move-result v$freeRegister
+                        if-nez v$freeRegister, :includeAdvancedMenu
+                    """,
+                    ExternalLabel("includeAdvancedMenu", getInstruction(endIndex))
+                )
+            }
+        }
+
        // endregion

        // region Patch for the new type of the video quality menu.
--- a/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuResourcePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuResourcePatch.kt
@@ -13,6 +13,7 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
 )
 object RestoreOldVideoQualityMenuResourcePatch : ResourcePatch() {
    internal var videoQualityBottomSheetListFragmentTitle = -1L
+    internal var videoQualityQuickMenuAdvancedMenuDescription = -1L

    override fun execute(context: ResourceContext) {
        AddResourcesPatch(this::class)
@@ -26,5 +27,10 @@ object RestoreOldVideoQualityMenuResourcePatch : ResourcePatch() {
            "layout",
            "video_quality_bottom_sheet_list_fragment_title",
        ]
+
+        videoQualityQuickMenuAdvancedMenuDescription = ResourceMappingPatch[
+            "string",
+            "video_quality_quick_menu_advanced_menu_description"
+        ]
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/fingerprints/VideoQualityMenuOptionsFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/fingerprints/VideoQualityMenuOptionsFingerprint.kt
@@ -0,0 +1,22 @@
+package app.revanced.patches.youtube.video.videoqualitymenu.fingerprints
+
+import app.revanced.patches.youtube.video.videoqualitymenu.RestoreOldVideoQualityMenuResourcePatch
+import app.revanced.util.patch.LiteralValueFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+internal object VideoQualityMenuOptionsFingerprint : LiteralValueFingerprint(
+    accessFlags = AccessFlags.STATIC.value,
+    parameters = listOf("Landroid/content/Context", "L", "L"),
+    returnType = "[L",
+    opcodes = listOf(
+        Opcode.IF_EQZ, // Check if advanced menu should be shown.
+        Opcode.NEW_ARRAY,
+        Opcode.APUT_OBJECT,
+        Opcode.APUT_OBJECT,
+        Opcode.APUT_OBJECT,
+        Opcode.RETURN_OBJECT,
+        Opcode.CONST_4 // Advanced menu code path.
+    ),
+    literalSupplier = { RestoreOldVideoQualityMenuResourcePatch.videoQualityQuickMenuAdvancedMenuDescription }
+)
--- a/src/main/resources/addresources/values/strings.xml
+++ b/src/main/resources/addresources/values/strings.xml
@@ -437,6 +437,9 @@
            <string name="revanced_switch_create_with_notifications_button_title">Switch Create with Notifications</string>
            <string name="revanced_switch_create_with_notifications_button_summary_on">Create button is switched with Notifications button\n\nNote: Enabling this also forcibly hides video ads</string>
            <string name="revanced_switch_create_with_notifications_button_summary_off">Create button is not switched with Notifications button</string>
+            <string name="revanced_hide_navigation_button_labels_title">Hide navigation button labels</string>
+            <string name="revanced_hide_navigation_button_labels_summary_on">Labels are hidden</string>
+            <string name="revanced_hide_navigation_button_labels_summary_off">Labels are shown</string>
        </patch>
        <patch id="layout.hide.player.flyoutmenupanel.HidePlayerFlyoutMenuPatch">
            <string name="revanced_hide_player_flyout_title">Flyout menu</string>
@@ -583,6 +586,9 @@
            <string name="revanced_hide_shorts_shop_button_title">Hide shop button</string>
            <string name="revanced_hide_shorts_shop_button_summary_on">Shop button is hidden</string>
            <string name="revanced_hide_shorts_shop_button_summary_off">Shop button is shown</string>
+            <string name="revanced_hide_shorts_super_thanks_button_title">Hide super thanks button</string>
+            <string name="revanced_hide_shorts_super_thanks_button_summary_on">Super thanks button is hidden</string>
+            <string name="revanced_hide_shorts_super_thanks_button_summary_off">Super thanks button is shown</string>
            <string name="revanced_hide_shorts_tagged_products_title">Hide tagged products</string>
            <string name="revanced_hide_shorts_tagged_products_summary_on">Tagged products are hidden</string>
            <string name="revanced_hide_shorts_tagged_products_summary_off">Tagged products are shown</string>
@@ -858,7 +864,7 @@
            <string name="revanced_sb_new_segment_confirm_title">Are the times correct?</string>
            <!-- Do not rearrange the (hour):(minute):second) time format operators here.
                 YT shows the same seekbar time format for all languages, and this string is confirming the segment time as it appears in the seekbar. -->
-            <string name="revanced_sb_new_segment_confirm_content">The segment lasts from %1$02d:%2$02d to %3$02d:%4$02d (%5$d minutes %6$02d seconds)\nIs it ready to submit?</string>
+            <string name="revanced_sb_new_segment_confirm_content">The segment is from\n\n%1$s\nto\n%2$s\n\n(%3$s)\n\nReady to submit?</string>
            <string name="revanced_sb_new_segment_start_is_before_end">Start must be before the end</string>
            <string name="revanced_sb_new_segment_mark_locations_first">Mark two locations on the time bar first</string>
            <string name="revanced_sb_new_segment_preview_segment_first">Preview the segment, and ensure it skips smoothly</string>
@@ -901,7 +907,7 @@
            <string name="revanced_spoof_app_version_summary_on">Version spoofed</string>
            <string name="revanced_spoof_app_version_summary_off">Version not spoofed</string>
            <string name="revanced_spoof_app_version_user_dialog_message">App version will be spoofed to an older version of YouTube.\n\nThis will change the appearance and features of the app, but unknown side effects may occur.\n\nIf later turned off, it is recommended to clear the app data to prevent UI bugs.</string>
-            <!-- It is ideal, but not required, if the text here appears alphabetically after the text used for 'revanced_spoof_app_version_title'.
+            <!-- It is ideal, but not required, if the text here appears is alphabetically after the text used for 'revanced_spoof_app_version_title'.
                 This is because the 'General layout' menu uses alphabetic sorting, and it functionally works better if the spoof target selector appears below the 'Spoof app version' UI switch -->
            <string name="revanced_spoof_app_version_target_title">Spoof app version target</string>
            <!-- 'RYD' is 'Return YouTube Dislike' -->
@@ -1079,6 +1085,21 @@
            <string name="revanced_slide_to_seek_summary_on">Slide to seek is enabled</string>
            <string name="revanced_slide_to_seek_summary_off">Slide to seek is not enabled</string>
        </patch>
+        <patch id="misc.fix.playback.SpoofClientPatch">
+            <string name="revanced_spoof_client_screen_title">Spoof client</string>
+            <string name="revanced_spoof_client_screen_summary">Spoof the client to prevent playback issues</string>
+            <string name="revanced_spoof_client_title">Spoof client</string>
+            <string name="revanced_spoof_client_summary_on">Client is spoofed</string>
+            <string name="revanced_spoof_client_summary_off">Client is not spoofed\n\nVideo playback may not work</string>
+            <string name="revanced_spoof_client_user_dialog_message">Turning off this setting may cause video playback issues.</string>
+            <!-- It is ideal, but not required, if the text here appears is alphabetically after the text used for 'revanced_client_spoof_title' -->
+            <string name="revanced_spoof_client_use_ios_title">Spoof client to iOS</string>
+            <string name="revanced_spoof_client_use_ios_summary">Spoof the client to iOS instead of an Android Testsuite</string>
+            <string name="revanced_spoof_client_use_ios_summary_on">Client is spoofed to an iOS client\n\nSide effects include:\n• 60 fps video may not be available\n• No HDR video\n• Some videos may not load\n• Higher video qualities may be missing</string>
+            <string name="revanced_spoof_client_use_ios_summary_off">Client is spoofed to an Android Testsuite client (iOS client is used for live streams)\n\nSide effects include:\n• Subtitles are missing\n• Player gestures may not work\n• Low quality Shorts seekbar thumbnails</string>
+            <string name="revanced_spoof_client_storyboard_timeout">Spoof client thumbnails not available (API timed out)</string>
+            <string name="revanced_spoof_client_storyboard_io_exception">Spoof client thumbnails temporarily not available: %s</string>
+        </patch>
        <!-- This patch is no longer used, these strings are not in use, and these strings will be deleted in the future. -->
        <patch id="misc.fix.playback.SpoofSignaturePatch">
            <string name="revanced_spoof_signature_verification_screen_title">Spoof app signature</string>
Author	SHA1	Message	Date
semantic-release-bot	2fc4d7f1bb	chore(release): 4.8.0-dev.24 [skip ci] # [4.8.0-dev.24](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.23...v4.8.0-dev.24) (2024-05-21) ### Bug Fixes * YouTube - Client spoof: Spoof client to fix playback ([#3199](https://github.com/ReVanced/revanced-patches/issues/3199)) ([`6ac3ba0`](`6ac3ba03aa`))	2024-05-21 00:43:47 +00:00
oSumAtrIX	6ac3ba03aa	fix(YouTube - Client spoof): Spoof client to fix playback (#3199 ) Co-authored-by: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com>	2024-05-21 02:41:35 +02:00
semantic-release-bot	fecfffc48f	chore(release): 4.8.0-dev.23 [skip ci] # [4.8.0-dev.23](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.22...v4.8.0-dev.23) (2024-05-18) ### Features * Piccoma: Add `Spoof Android device ID` patch ([#3145](https://github.com/ReVanced/revanced-patches/issues/3145)) ([`cca5a8b`](`cca5a8b44d`))	2024-05-18 21:07:29 +00:00
Romain	cca5a8b44d	feat(Piccoma): Add `Spoof Android device ID` patch (#3145 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-05-18 23:04:58 +02:00
semantic-release-bot	c09eaa5911	chore(release): 4.8.0-dev.22 [skip ci] # [4.8.0-dev.22](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.21...v4.8.0-dev.22) (2024-05-18) ### Bug Fixes * Use correct preference key ([`09d2015`](`09d20158a3`))	2024-05-18 21:04:01 +00:00
oSumAtrIX	09d20158a3	fix: Use correct preference key	2024-05-18 23:02:04 +02:00
semantic-release-bot	5d56662637	chore(release): 4.8.0-dev.21 [skip ci] # [4.8.0-dev.21](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.20...v4.8.0-dev.21) (2024-05-18) ### Features * Piccoma: Add `Disable tracking` patch ([#3143](https://github.com/ReVanced/revanced-patches/issues/3143)) ([`bf61b51`](`bf61b51856`)) * YouTube - Navigation buttons: Add option to hide navigation button labels ([#3189](https://github.com/ReVanced/revanced-patches/issues/3189)) ([`0e42d1b`](`0e42d1b224`))	2024-05-18 20:55:54 +00:00
MarcaD	0e42d1b224	feat(YouTube - Navigation buttons): Add option to hide navigation button labels (#3189 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-05-18 22:53:41 +02:00
Romain	bf61b51856	feat(Piccoma): Add `Disable tracking` patch (#3143 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-05-18 22:53:19 +02:00
semantic-release-bot	99888044de	chore(release): 4.8.0-dev.20 [skip ci] # [4.8.0-dev.20](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.19...v4.8.0-dev.20) (2024-05-16) ### Features * YT Music: Add support for `7.01.52` ([#3177](https://github.com/ReVanced/revanced-patches/issues/3177)) ([`5ba63e1`](`5ba63e1d7d`))	2024-05-16 17:14:19 +00:00
LisoUseInAIKyrios	5ba63e1d7d	feat(YT Music): Add support for `7.01.52` (#3177 )	2024-05-16 21:12:04 +04:00
semantic-release-bot	c2624a10a4	chore(release): 4.8.0-dev.19 [skip ci] # [4.8.0-dev.19](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.18...v4.8.0-dev.19) (2024-05-16) ### Features * YouTube - Hide Shorts components: Hide 'Buy super thanks' button ([#3176](https://github.com/ReVanced/revanced-patches/issues/3176)) ([`7655619`](`7655619e02`))	2024-05-16 17:11:23 +00:00
LisoUseInAIKyrios	7655619e02	feat(YouTube - Hide Shorts components): Hide 'Buy super thanks' button (#3176 )	2024-05-16 21:09:15 +04:00
semantic-release-bot	245c2ad536	chore(release): 4.8.0-dev.18 [skip ci] # [4.8.0-dev.18](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.17...v4.8.0-dev.18) (2024-05-14) ### Bug Fixes * YouTube Music: Make `Hide 'Get Music Premium' label` and `Remove upgrade button` compatible with latest version ([#3164](https://github.com/ReVanced/revanced-patches/issues/3164)) ([`d859b15`](`d859b15950`))	2024-05-14 17:47:20 +00:00
Alberto Ponces	d859b15950	fix(YouTube Music): Make `Hide 'Get Music Premium' label` and `Remove upgrade button` compatible with latest version (#3164 )	2024-05-14 19:45:06 +02:00
semantic-release-bot	6fa80c5959	chore(release): 4.8.0-dev.17 [skip ci] # [4.8.0-dev.17](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.16...v4.8.0-dev.17) (2024-05-12) ### Features * Photomath: Support version `8.37.0` ([#3109](https://github.com/ReVanced/revanced-patches/issues/3109)) ([`2f28078`](`2f280784fa`))	2024-05-12 23:47:30 +00:00
FullerBread2032	2f280784fa	feat(Photomath): Support version `8.37.0` (#3109 )	2024-05-13 01:45:13 +02:00
semantic-release-bot	a4fbed5b78	chore(release): 4.8.0-dev.16 [skip ci] # [4.8.0-dev.16](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.15...v4.8.0-dev.16) (2024-05-12) ### Features * WarnWetter - Promo code unlock: Constrain to last working version ([#3110](https://github.com/ReVanced/revanced-patches/issues/3110)) ([`8994c5d`](`8994c5dd5e`))	2024-05-12 23:42:52 +00:00
Bceez	8994c5dd5e	feat(WarnWetter - Promo code unlock): Constrain to last working version (#3110 )	2024-05-13 01:40:52 +02:00
semantic-release-bot	41e91145e0	chore(release): 4.8.0-dev.15 [skip ci] # [4.8.0-dev.15](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.14...v4.8.0-dev.15) (2024-05-11) ### Bug Fixes * YouTube - Restore old video quality menu: Show advanced quality menu in Shorts quality flyout ([#3155](https://github.com/ReVanced/revanced-patches/issues/3155)) ([`eec8a9f`](`eec8a9f794`))	2024-05-11 20:32:34 +00:00
LisoUseInAIKyrios	eec8a9f794	fix(YouTube - Restore old video quality menu): Show advanced quality menu in Shorts quality flyout (#3155 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-05-12 00:30:36 +04:00
semantic-release-bot	aff88dc71f	chore(release): 4.8.0-dev.14 [skip ci] # [4.8.0-dev.14](https://github.com/ReVanced/revanced-patches/compare/v4.8.0-dev.13...v4.8.0-dev.14) (2024-05-08) ### Bug Fixes * YouTube - SponsorBlock: Show correct segment times if video is over 24 hours in length ([#3138](https://github.com/ReVanced/revanced-patches/issues/3138)) ([`5548bc5`](`5548bc5ef7`))	2024-05-08 22:29:24 +00:00
LisoUseInAIKyrios	5548bc5ef7	fix(YouTube - SponsorBlock): Show correct segment times if video is over 24 hours in length (#3138 )	2024-05-09 02:27:22 +04:00