chore(release): 4.4.0-dev.10 [skip ci]

# [4.4.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.9...v4.4.0-dev.10) (2024-03-25) ### Bug Fixes * **YouTube - Hide ads:** Prevent app crash if hiding fullscreen ads is not possible ([#2910](https://github.com/ReVanced/revanced-patches/issues/2910)) ([2fcd786](2fcd786cc7))
fix(YouTube - Hide ads): Prevent app crash if hiding fullscreen ads is not possible (#2910 )
2025-12-25 10:24:08 +01:00 · 2024-03-25 16:15:34 +00:00 · 2024-03-25 20:13:28 +04:00 · 2024-03-18 00:23:31 +00:00 · 2024-03-18 04:21:34 +04:00 · 2024-03-15 12:35:13 +00:00
76 changed files with 614 additions and 432 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,45 @@
+# [4.4.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.9...v4.4.0-dev.10) (2024-03-25)
+
+
+### Bug Fixes
+
+* **YouTube - Hide ads:** Prevent app crash if hiding fullscreen ads is not possible ([#2910](https://github.com/ReVanced/revanced-patches/issues/2910)) ([9f50470](https://github.com/ReVanced/revanced-patches/commit/9f50470bf6582fe2f20a903a97bf66c41f296fb2))
+
+# [4.4.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.8...v4.4.0-dev.9) (2024-03-18)
+
+
+### Bug Fixes
+
+* **TikTok:** Hook application context earlier to prevent crash ([#2893](https://github.com/ReVanced/revanced-patches/issues/2893)) ([395ccda](https://github.com/ReVanced/revanced-patches/commit/395ccda7b9218c522c7ca0f99f75a12036d3e3f3))
+
+# [4.4.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.7...v4.4.0-dev.8) (2024-03-15)
+
+
+### Features
+
+* **YouTube - Downloads:** Use external downloader when selecting 'Download' in home feed flyout menu ([#2881](https://github.com/ReVanced/revanced-patches/issues/2881)) ([10afc8c](https://github.com/ReVanced/revanced-patches/commit/10afc8cc71ff29fea4937fb12fd3d1edf9c581f5))
+
+# [4.4.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.6...v4.4.0-dev.7) (2024-03-14)
+
+
+### Bug Fixes
+
+* **YouTube - Client spoof:** Spoof all user agents ([44a8a13](https://github.com/ReVanced/revanced-patches/commit/44a8a1399897caaff3ff45db8549ddedb2f01b68))
+
+# [4.4.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.5...v4.4.0-dev.6) (2024-03-12)
+
+
+### Features
+
+* **Instagram - Hide timeline ads:** Make compatible with latest versions ([a212f29](https://github.com/ReVanced/revanced-patches/commit/a212f29bd33bb5e10f024e058d26e20ee926190b))
+
+# [4.4.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.4...v4.4.0-dev.5) (2024-03-11)
+
+
+### Features
+
+* **YouTube:** Support version `19.05`, `19.06`, `19.07`, `19.08` and `19.09` ([#2862](https://github.com/ReVanced/revanced-patches/issues/2862)) ([f044dde](https://github.com/ReVanced/revanced-patches/commit/f044dde054861ff16846a6be6287f86fa3afb3d8))
+
 # [4.4.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.3...v4.4.0-dev.4) (2024-03-11)


--- a/api/revanced-patches.api
+++ b/api/revanced-patches.api
@@ -628,9 +628,19 @@ public abstract class app/revanced/patches/shared/misc/integrations/BaseIntegrat
 	public fun <init> ()V
 	public fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Iterable;Ljava/lang/Iterable;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)V
 	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Iterable;Ljava/lang/Iterable;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Iterable;Ljava/lang/Iterable;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Iterable;Ljava/lang/Iterable;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun invoke (Ljava/lang/String;)V
 }

+public abstract interface class app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch$IntegrationsFingerprint$IHookInsertIndexResolver : kotlin/jvm/functions/Function1 {
+	public abstract fun invoke (Lcom/android/tools/smali/dexlib2/iface/Method;)Ljava/lang/Integer;
+}
+
+public final class app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch$IntegrationsFingerprint$IHookInsertIndexResolver$DefaultImpls {
+	public static fun invoke (Lapp/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch$IntegrationsFingerprint$IHookInsertIndexResolver;Lcom/android/tools/smali/dexlib2/iface/Method;)Ljava/lang/Integer;
+}
+
 public abstract interface class app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch$IntegrationsFingerprint$IRegisterResolver : kotlin/jvm/functions/Function1 {
 	public abstract fun invoke (Lcom/android/tools/smali/dexlib2/iface/Method;)Ljava/lang/Integer;
 }
@@ -1514,10 +1524,12 @@ 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/patcher/patch/BytecodePatch {
+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 fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
+	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/SpoofSignaturePatch : app/revanced/patcher/patch/BytecodePatch {
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.4.0-dev.4
+version = 4.4.0-dev.10
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/HideTimelineAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/HideTimelineAdsPatch.kt
@@ -1,102 +1,63 @@
 package app.revanced.patches.instagram.patches.ads.timeline

-import app.revanced.util.exception
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
 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.instagram.patches.ads.timeline.fingerprints.MediaFingerprint
+import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.IsAdCheckOneFingerprint
+import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.IsAdCheckTwoFingerprint
 import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ShowAdFingerprint
-import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.GenericMediaAdFingerprint
-import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.MediaAdFingerprint
-import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.PaidPartnershipAdFingerprint
-import app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads.ShoppingAdFingerprint
+import app.revanced.util.exception
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction

@Patch(
    name = "Hide timeline ads",
-    description = "Removes ads from the timeline.",
-    compatiblePackages = [CompatiblePackage("com.instagram.android", ["275.0.0.27.98"])]
+    compatiblePackages = [CompatiblePackage("com.instagram.android")],
 )
@Suppress("unused")
 object HideTimelineAdsPatch : BytecodePatch(
    setOf(
        ShowAdFingerprint,
-        MediaFingerprint,
-        PaidPartnershipAdFingerprint // Unlike the other ads this one is resolved from all classes.
-    )
+        IsAdCheckOneFingerprint,
+        IsAdCheckTwoFingerprint,
+    ),
 ) {
    override fun execute(context: BytecodeContext) {
-        // region Resolve required methods to check for ads.
+        // The exact function of the following methods is unknown.
+        // They are used to check if a post is an ad.
+        val isAdCheckOneMethod = IsAdCheckOneFingerprint.result?.method ?: throw IsAdCheckOneFingerprint.exception
+        val isAdCheckTwoMethod = IsAdCheckTwoFingerprint.result?.method ?: throw IsAdCheckTwoFingerprint.exception

-        ShowAdFingerprint.result ?: throw ShowAdFingerprint.exception
+        ShowAdFingerprint.result?.let {
+            it.mutableMethod.apply {
+                // The register that holds the post object.
+                val postRegister = getInstruction<FiveRegisterInstruction>(1).registerC

-        PaidPartnershipAdFingerprint.result ?: throw PaidPartnershipAdFingerprint.exception
+                // At this index the check for an ad can be performed.
+                val checkIndex = it.scanResult.patternScanResult!!.endIndex

-        MediaFingerprint.result?.let {
-            GenericMediaAdFingerprint.resolve(context, it.classDef)
-            ShoppingAdFingerprint.resolve(context, it.classDef)
-
-            return@let
-        } ?: throw MediaFingerprint.exception
-
-        // endregion
-
-        ShowAdFingerprint.result!!.apply {
-            // region Create instructions.
-
-            val scanStart = scanResult.patternScanResult!!.startIndex
-            val jumpIndex = scanStart - 1
-
-            val mediaInstanceRegister = mutableMethod.getInstruction<FiveRegisterInstruction>(scanStart).registerC
-            val freeRegister = mutableMethod.getInstruction<OneRegisterInstruction>(jumpIndex).registerA
-
-            val returnFalseLabel = "an_ad"
-
-            val checkForAdInstructions =
-                listOf(GenericMediaAdFingerprint, PaidPartnershipAdFingerprint, ShoppingAdFingerprint)
-                    .map(MediaAdFingerprint::toString)
-                    .joinToString("\n") {
-                        """ 
-                            invoke-virtual {v$mediaInstanceRegister}, $it
-                            move-result v$freeRegister
-                            if-nez v$freeRegister, :$returnFalseLabel
-                        """.trimIndent()
-                    }.let { "$it\nconst/4 v0, 0x1\nreturn v0" }
-
-            // endregion
-
-            // region Patch.
-
-            val insertIndex = scanStart + 3
-
-            mutableMethod.addInstructionsWithLabels(
-                insertIndex,
-                checkForAdInstructions,
-                ExternalLabel(
-                    returnFalseLabel,
-                    mutableMethod.getInstruction(mutableMethod.implementation!!.instructions.size - 2 /* return false = ad */)
-                )
-            )
-
-            // endregion
-
-            // region Jump to checks for ads from previous patch.
-
-            mutableMethod.apply {
+                // If either check returns true, the post is an ad and is hidden by returning false.
                addInstructionsWithLabels(
-                    jumpIndex + 1,
-                    "if-nez v$freeRegister, :start_check",
-                    ExternalLabel("start_check", getInstruction(insertIndex))
+                    checkIndex,
+                    """
+                        invoke-virtual { v$postRegister }, $isAdCheckOneMethod
+                        move-result v0
+                        if-nez v0, :hide_ad
+                        
+                        invoke-static { v$postRegister }, $isAdCheckTwoMethod
+                        move-result v0
+                        if-eqz v0, :not_an_ad
+                        
+                        :hide_ad
+                        const/4 v0, 0x0 # Returning false to hide the ad.
+                        return v0
+                    """,
+                    ExternalLabel("not_an_ad", getInstruction(checkIndex)),
                )
-            }.removeInstruction(jumpIndex)
-
-            // endregion
-        }
+            }
+        } ?: throw ShowAdFingerprint.exception
    }
-}
+}
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/IsAdCheckOneFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/IsAdCheckOneFingerprint.kt
@@ -0,0 +1,18 @@
+package app.revanced.patches.instagram.patches.ads.timeline.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 IsAdCheckOneFingerprint : MethodFingerprint(
+    returnType = "Z",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf(),
+    opcodes = listOf(
+        Opcode.XOR_INT_LIT8,
+        Opcode.IF_NE,
+        Opcode.RETURN,
+        Opcode.INVOKE_VIRTUAL,
+    ),
+)
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/GenericMediaAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/GenericMediaAdFingerprint.kt
@@ -1,8 +1,14 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
+package app.revanced.patches.instagram.patches.ads.timeline.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 GenericMediaAdFingerprint : MediaAdFingerprint(
+internal object IsAdCheckTwoFingerprint : MethodFingerprint(
+    returnType = "Z",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
+    parameters = listOf("L"),
    opcodes = listOf(
        Opcode.INVOKE_INTERFACE,
        Opcode.MOVE_RESULT_OBJECT,
@@ -12,7 +18,5 @@ internal object GenericMediaAdFingerprint : MediaAdFingerprint(
        Opcode.IF_EQZ,
        Opcode.CONST_4,
        Opcode.RETURN,
-    )
-) {
-    override fun toString() = result!!.method.toString()
-}
+    ),
+)
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/MediaFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/MediaFingerprint.kt
@@ -1,7 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-internal object MediaFingerprint : MethodFingerprint(
-    strings = listOf("force_overlay", "Media#updateFields", "live_reels_metadata")
-)
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ShowAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ShowAdFingerprint.kt
@@ -10,16 +10,12 @@ internal object ShowAdFingerprint : MethodFingerprint(
    AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.FINAL,
    listOf("L", "L", "Z", "Z"),
    opcodes = listOf(
+        Opcode.SGET_OBJECT,
+        Opcode.IF_NE,
+        Opcode.IF_NEZ,
        Opcode.INVOKE_STATIC,
        Opcode.MOVE_RESULT,
        Opcode.IF_NEZ,
        Opcode.RETURN,
-        Opcode.CONST_4,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.GOTO,
-        Opcode.CONST_4,
    ),
 )
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/MediaAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/MediaAdFingerprint.kt
@@ -1,24 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
-
-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
-import com.android.tools.smali.dexlib2.iface.ClassDef
-import com.android.tools.smali.dexlib2.iface.Method
-
-internal abstract class MediaAdFingerprint(
-    returnType: String? = "Z",
-    accessFlags: Int? = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters: Iterable<String>? = listOf(),
-    opcodes: Iterable<Opcode>?,
-    customFingerprint: ((methodDef: Method, classDef: ClassDef) -> Boolean)? = null
-) : MethodFingerprint(
-    returnType,
-    accessFlags,
-    parameters,
-    opcodes,
-    customFingerprint = customFingerprint
-) {
-    abstract override fun toString(): String
-}
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/PaidPartnershipAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/PaidPartnershipAdFingerprint.kt
@@ -1,29 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
-
-import com.android.tools.smali.dexlib2.Opcode
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
-import com.android.tools.smali.dexlib2.iface.reference.MethodReference
-
-internal object PaidPartnershipAdFingerprint : MediaAdFingerprint(
-    "V",
-    null,
-    listOf("L", "L"),
-    listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IPUT_BOOLEAN
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("ClipsEditMetadataController;")
-    }
-) {
-    override fun toString() = result!!.let {
-        val adCheckIndex = it.scanResult.patternScanResult!!.startIndex
-        val adCheckInstruction = it.method.implementation!!.instructions.elementAt(adCheckIndex)
-
-        val adCheckMethod = (adCheckInstruction as ReferenceInstruction).reference as MethodReference
-
-        adCheckMethod.toString()
-    }
-}
--- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/ShoppingAdFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/fingerprints/ads/ShoppingAdFingerprint.kt
@@ -1,21 +0,0 @@
-package app.revanced.patches.instagram.patches.ads.timeline.fingerprints.ads
-
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object ShoppingAdFingerprint : MediaAdFingerprint(
-    opcodes = listOf(
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.XOR_INT_LIT8,
-        Opcode.IF_EQZ,
-    )
-) {
-    override fun toString() = result!!.method.toString()
-}
--- a/src/main/kotlin/app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/shared/misc/integrations/BaseIntegrationsPatch.kt
@@ -49,7 +49,8 @@ abstract class BaseIntegrationsPatch(
        opcodes: Iterable<Opcode?>? = null,
        strings: Iterable<String>? = null,
        customFingerprint: ((methodDef: Method, classDef: ClassDef) -> Boolean)? = null,
-        private val contextRegisterResolver: (Method) -> Int = object : IRegisterResolver {},
+        private val insertIndexResolver: ((Method) -> Int) = object : IHookInsertIndexResolver {},
+        private val contextRegisterResolver: (Method) -> Int = object : IRegisterResolver {}
    ) : MethodFingerprint(
        returnType,
        accessFlags,
@@ -58,18 +59,45 @@ abstract class BaseIntegrationsPatch(
        strings,
        customFingerprint,
    ) {
+        @Deprecated("Previous constructor that is missing the insert index." +
+                "Here only for binary compatibility, " +
+                "and this can be removed after the next major version update.")
+        constructor(
+            returnType: String? = null,
+            accessFlags: Int? = null,
+            parameters: Iterable<String>? = null,
+            opcodes: Iterable<Opcode?>? = null,
+            strings: Iterable<String>? = null,
+            customFingerprint: ((methodDef: Method, classDef: ClassDef) -> Boolean)? = null,
+            contextRegisterResolver: (Method) -> Int = object : IRegisterResolver {}
+        ) : this(
+            returnType,
+            accessFlags,
+            parameters,
+            opcodes,
+            strings,
+            customFingerprint,
+            object : IHookInsertIndexResolver {},
+            contextRegisterResolver
+        )
+
        fun invoke(integrationsDescriptor: String) {
            result?.mutableMethod?.let { method ->
+                val insertIndex = insertIndexResolver(method)
                val contextRegister = contextRegisterResolver(method)

                method.addInstruction(
-                    0,
+                    insertIndex,
                    "invoke-static/range { v$contextRegister .. v$contextRegister }, " +
                        "$integrationsDescriptor->setContext(Landroid/content/Context;)V",
                )
            } ?: throw PatchException("Could not find hook target fingerprint.")
        }

+        interface IHookInsertIndexResolver : (Method) -> Int {
+            override operator fun invoke(method: Method) = 0
+        }
+
        interface IRegisterResolver : (Method) -> Int {
            override operator fun invoke(method: Method) = method.implementation!!.registerCount - 1
        }
--- a/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/fingerprints/InitFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/integrations/fingerprints/InitFingerprint.kt
@@ -1,10 +1,14 @@
 package app.revanced.patches.tiktok.misc.integrations.fingerprints

+import app.revanced.patcher.extensions.or
 import app.revanced.patches.shared.misc.integrations.BaseIntegrationsPatch.IntegrationsFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags

 internal object InitFingerprint : IntegrationsFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
    customFingerprint = { methodDef, _ ->
        methodDef.definingClass.endsWith("/AwemeHostApplication;") &&
-                methodDef.name == "onCreate"
-    }
+                methodDef.name == "<init>"
+    },
+    insertIndexResolver = { 1 } // Insert after call to super class.
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
@@ -36,9 +36,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37",
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ],
        ),
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt
@@ -30,9 +30,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt
@@ -35,9 +35,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt
@@ -23,9 +23,13 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37",
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ],
        ),
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt
@@ -32,9 +32,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt
@@ -6,9 +6,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWith
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.youtube.interaction.downloads.fingerprints.DownloadActionCommandResolverFingerprint
-import app.revanced.patches.youtube.interaction.downloads.fingerprints.DownloadActionCommandResolverParentFingerprint
-import app.revanced.patches.youtube.interaction.downloads.fingerprints.LegacyDownloadCommandResolverFingerprint
+import app.revanced.patches.youtube.interaction.downloads.fingerprints.OfflineVideoEndpointFingerprint
 import app.revanced.patches.youtube.misc.playercontrols.PlayerControlsBytecodePatch
 import app.revanced.patches.youtube.shared.fingerprints.MainActivityFingerprint
 import app.revanced.patches.youtube.video.information.VideoInformationPatch
@@ -31,9 +29,13 @@ import app.revanced.util.resultOrThrow
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37",
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ],
        ),
    ],
@@ -41,8 +43,7 @@ import app.revanced.util.resultOrThrow
@Suppress("unused")
 object DownloadsPatch : BytecodePatch(
    setOf(
-        DownloadActionCommandResolverParentFingerprint,
-        LegacyDownloadCommandResolverFingerprint,
+        OfflineVideoEndpointFingerprint,
        MainActivityFingerprint
    )
 ) {
@@ -61,36 +62,16 @@ object DownloadsPatch : BytecodePatch(
            )
        }

-        val commonInstructions = """
-            move-result v0
-            if-eqz v0, :show_native_downloader
-            return-void
-            :show_native_downloader
-            nop
-        """
-
-        DownloadActionCommandResolverFingerprint.resolve(context,
-            DownloadActionCommandResolverParentFingerprint.resultOrThrow().classDef)
-        DownloadActionCommandResolverFingerprint.resultOrThrow().mutableMethod.apply {
+        OfflineVideoEndpointFingerprint.resultOrThrow().mutableMethod.apply {
            addInstructionsWithLabels(
                0,
                """
-                    invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->inAppDownloadButtonOnClick()Z
-                    $commonInstructions
-                """
-            )
-        }
-
-        // Legacy fingerprint is used for old spoofed versions,
-        // or if download playlist is pressed on any version.
-        // Downloading playlists is not yet supported,
-        // as the code this hooks does not easily expost the playlist id.
-        LegacyDownloadCommandResolverFingerprint.resultOrThrow().mutableMethod.apply {
-            addInstructionsWithLabels(
-                0,
-                """
-                    invoke-static/range {p1 .. p1}, $INTEGRATIONS_CLASS_DESCRIPTOR->inAppDownloadPlaylistLegacyOnClick(Ljava/lang/String;)Z
-                    $commonInstructions
+                    invoke-static/range {p3 .. p3}, $INTEGRATIONS_CLASS_DESCRIPTOR->inAppDownloadButtonOnClick(Ljava/lang/String;)Z
+                    move-result v0
+                    if-eqz v0, :show_native_downloader
+                    return-void
+                    :show_native_downloader
+                    nop
                """
            )
        }
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/fingerprints/DownloadActionCommandResolverParentFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/fingerprints/DownloadActionCommandResolverParentFingerprint.kt
@@ -1,17 +0,0 @@
-package app.revanced.patches.youtube.interaction.downloads.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.util.patch.LiteralValueFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-internal object DownloadActionCommandResolverParentFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("L", "L"),
-    strings = listOf(
-        // Strings are not unique and found in other methods.
-        "com.google.android.libraries.youtube.logging.interaction_logger",
-        "Unknown command"
-        ),
-    literalSupplier = { 16 }
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/fingerprints/LegacyDownloadCommandResolverFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/fingerprints/LegacyDownloadCommandResolverFingerprint.kt
@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.interaction.downloads.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
-
-/**
- * For spoofing to older versions.  Also called if download playlist is pressed for any version.
- */
-internal object LegacyDownloadCommandResolverFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("Ljava/lang/String;", "Ljava/lang/String;", "L", "L"),
-    strings = listOf(""),
-    opcodes = listOf(
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-    )
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/fingerprints/DownloadActionCommandResolverFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/fingerprints/DownloadActionCommandResolverFingerprint.kt
@@ -4,11 +4,13 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags

-/**
- * Resolves to the class found in [DownloadActionCommandResolverParentFingerprint].
- */
-internal object DownloadActionCommandResolverFingerprint : MethodFingerprint(
+internal object OfflineVideoEndpointFingerprint : MethodFingerprint(
    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
    returnType = "V",
-    parameters = listOf("L", "Ljava/util/Map;")
+    parameters = listOf(
+        "Ljava/util/Map;",
+        "L",
+        "Ljava/lang/String", // VideoId
+        "L"),
+    strings = listOf("Object is not an offlineable video: ")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt
@@ -32,9 +32,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt
@@ -34,9 +34,13 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt
@@ -30,9 +30,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt
@@ -36,9 +36,13 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt
@@ -34,9 +34,13 @@ import app.revanced.util.exception
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt
@@ -33,9 +33,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt
@@ -43,9 +43,13 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt
@@ -34,9 +34,13 @@ import com.android.tools.smali.dexlib2.Opcode
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- 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
@@ -41,9 +41,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37",
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ],
        ),
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt
@@ -38,9 +38,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction3rc
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt
@@ -32,9 +32,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch.kt
@@ -32,9 +32,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt
@@ -32,9 +32,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt
@@ -32,9 +32,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt
@@ -35,9 +35,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt
@@ -32,9 +32,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt
@@ -28,9 +28,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt
@@ -28,9 +28,13 @@ import app.revanced.util.exception
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -48,9 +48,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37",
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ],
        ),
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt
@@ -39,9 +39,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch.kt
@@ -28,9 +28,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt
@@ -33,9 +33,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt
@@ -30,9 +30,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt
@@ -35,9 +35,13 @@ import app.revanced.patches.youtube.shared.fingerprints.SeekbarOnDrawFingerprint
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt
@@ -40,9 +40,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt
@@ -27,9 +27,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt
@@ -28,9 +28,13 @@ import app.revanced.util.exception
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt
@@ -29,9 +29,13 @@ import app.revanced.util.exception
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt
@@ -24,9 +24,13 @@ import org.w3c.dom.Element
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37",
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ],
        ),
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt
@@ -58,9 +58,13 @@ import com.android.tools.smali.dexlib2.iface.reference.TypeReference
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt
@@ -33,9 +33,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/RestoreOldSeekbarThumbnailsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/RestoreOldSeekbarThumbnailsPatch.kt
@@ -29,9 +29,13 @@ import app.revanced.util.exception
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockBytecodePatch.kt
@@ -42,9 +42,13 @@ import com.android.tools.smali.dexlib2.iface.reference.StringReference
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt
@@ -32,9 +32,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt
@@ -38,9 +38,13 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/TabletMiniPlayerPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/TabletMiniPlayerPatch.kt
@@ -37,9 +37,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            )
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeBytecodePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeBytecodePatch.kt
@@ -41,9 +41,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt
@@ -53,9 +53,13 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37",
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ],
        ),
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt
@@ -33,9 +33,13 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt
@@ -28,9 +28,13 @@ import app.revanced.util.exception
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/ClientSpoofPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/ClientSpoofPatch.kt
@@ -1,47 +1,87 @@
 package app.revanced.patches.youtube.misc.fix.playback

-import app.revanced.util.exception
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.UserAgentHeaderBuilderFingerprint
-import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patches.all.misc.transformation.BaseTransformInstructionsPatch
+import app.revanced.patches.all.misc.transformation.IMethodCall
+import app.revanced.patches.all.misc.transformation.Instruction35cInfo
+import app.revanced.patches.all.misc.transformation.filterMapInstruction35c
+import app.revanced.util.getReference
+import com.android.tools.smali.dexlib2.iface.ClassDef
+import com.android.tools.smali.dexlib2.iface.Method
+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 = "Adds options to spoof the client to allow video playback.",
    dependencies = [SpoofSignaturePatch::class],
    compatiblePackages = [
-        CompatiblePackage(
-            "com.google.android.youtube", [
-                "18.48.39",
-                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.35",
-                "19.03.36",
-                "19.04.37"
-            ]
-        )
-    ]
+        CompatiblePackage("com.google.android.youtube"),
+    ],
 )
-object ClientSpoofPatch : BytecodePatch(
-    setOf(UserAgentHeaderBuilderFingerprint)
-) {
+object ClientSpoofPatch : 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;"

-    override fun execute(context: BytecodeContext) {
-        UserAgentHeaderBuilderFingerprint.result?.let { result ->
-            val insertIndex = result.scanResult.patternScanResult!!.endIndex
-           result.mutableMethod.apply {
-               val packageNameRegister = getInstruction<FiveRegisterInstruction>(insertIndex).registerD
+    override fun filterMap(
+        classDef: ClassDef,
+        method: Method,
+        instruction: Instruction,
+        instructionIndex: Int,
+    ) = filterMapInstruction35c<MethodCall>(
+        "Lapp/revanced/integrations",
+        classDef,
+        instruction,
+        instructionIndex,
+    )

-               addInstruction(insertIndex, "const-string v$packageNameRegister, \"$ORIGINAL_PACKAGE_NAME\"")
-           }
+    override fun transform(mutableMethod: MutableMethod, entry: Instruction35cInfo) {
+        val (_, _, instructionIndex) = entry

-        } ?: throw UserAgentHeaderBuilderFingerprint.exception
+        // Replace the result of context.getPackageName(), if it is used in a user agent string.
+        mutableMethod.apply {
+            // After context.getPackageName() the result is moved to a register.
+            val targetRegister = (
+                getInstruction(instructionIndex + 1)
+                    as? OneRegisterInstruction ?: return
+                ).registerA
+
+            // IndexOutOfBoundsException is not possible here,
+            // but no such occurrences are present in the app.
+            val referee = getInstruction(instructionIndex + 2).getReference<MethodReference>()?.toString()
+
+            // This can technically also match non-user agent string builder append methods,
+            // but no such occurrences are present in the app.
+            if (referee != USER_AGENT_STRING_BUILDER_APPEND_METHOD_REFERENCE) {
+                return
+            }
+
+            // Overwrite the result of context.getPackageName() with the original package name.
+            replaceInstruction(
+                instructionIndex + 1,
+                "const-string v$targetRegister, \"${ORIGINAL_PACKAGE_NAME}\"",
+            )
+        }
+    }
+
+    @Suppress("unused")
+    private enum class MethodCall(
+        override val definedClassName: String,
+        override val methodName: String,
+        override val methodParams: Array<String>,
+        override val returnType: String,
+    ) : IMethodCall {
+        GetPackageName(
+            "Landroid/content/Context;",
+            "getPackageName",
+            emptyArray(),
+            "Ljava/lang/String;",
+        ),
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/UserAgentHeaderBuilderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/UserAgentHeaderBuilderFingerprint.kt
@@ -1,10 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object UserAgentHeaderBuilderFingerprint : MethodFingerprint(
-    parameters = listOf("L", "L", "L"),
-    opcodes = listOf(Opcode.MOVE_RESULT_OBJECT, Opcode.INVOKE_VIRTUAL),
-    strings = listOf("(Linux; U; Android "),
-)
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt
@@ -38,9 +38,13 @@ object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            )
        )
    ),
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt
@@ -30,9 +30,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt
@@ -34,9 +34,13 @@ import com.android.tools.smali.dexlib2.iface.reference.StringReference
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/LithoFilterPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/LithoFilterPatch.kt
@@ -10,14 +10,20 @@ import app.revanced.patcher.extensions.InstructionExtensions.removeInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
 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.fingerprints.*
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstruction
+import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 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.instruction.ReferenceInstruction
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+import com.android.tools.smali.dexlib2.iface.reference.TypeReference
 import java.io.Closeable

@Patch(
@@ -102,7 +108,11 @@ object LithoFilterPatch : BytecodePatch(
            val emptyComponentFieldIndex = builderMethodIndex + 2

            bytesToComponentContextMethod.mutableMethod.apply {
-                val insertHookIndex = bytesToComponentContextMethod.scanResult.patternScanResult!!.endIndex + 1
+                val insertHookIndex = indexOfFirstInstruction {
+                    opcode == Opcode.IPUT_OBJECT &&
+                            getReference<FieldReference>()?.type == "Ljava/lang/StringBuilder;"
+                } + 1
+                if (insertHookIndex <= 0) throw PatchException("Could not find insert index")

                // region Get free registers that this patch uses.
                // Registers are overwritten right after they are used in this patch, therefore free to clobber.
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/fingerprints/ComponentContextParserFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/fingerprints/ComponentContextParserFingerprint.kt
@@ -1,13 +1,7 @@
 package app.revanced.patches.youtube.misc.litho.filter.fingerprints

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

 internal object ComponentContextParserFingerprint : MethodFingerprint(
-    opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IPUT_OBJECT,
-    ),
    strings = listOf("Component was not found %s because it was removed due to duplicate converter bindings.")
 )
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt
@@ -39,9 +39,13 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt
@@ -35,9 +35,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/video/hdrbrightness/HDRBrightnessPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/hdrbrightness/HDRBrightnessPatch.kt
@@ -10,6 +10,7 @@ import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.patches.youtube.video.hdrbrightness.fingerprints.HDRBrightnessFingerprint
+import app.revanced.util.exception
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
@@ -32,12 +33,16 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37",
-            ],
-        ),
-    ],
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                // 19.09+ is dramatically different and the patched code is not present.
+            ]
+        )
+    ]
 )
@Suppress("unused")
 object HDRBrightnessPatch : BytecodePatch(
@@ -46,27 +51,31 @@ object HDRBrightnessPatch : BytecodePatch(
    override fun execute(context: BytecodeContext) {
        AddResourcesPatch(this::class)

+        if (HDRBrightnessFingerprint.result == null) throw HDRBrightnessFingerprint.exception
+
        SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
            SwitchPreference("revanced_hdr_auto_brightness"),
        )

-        val method = HDRBrightnessFingerprint.result!!.mutableMethod
-
-        method.implementation!!.instructions.filter { instruction ->
-            val fieldReference = (instruction as? ReferenceInstruction)?.reference as? FieldReference
-            fieldReference?.let { it.name == "screenBrightness" } == true
-        }.forEach { instruction ->
-            val brightnessRegisterIndex = method.implementation!!.instructions.indexOf(instruction)
-            val register = (instruction as TwoRegisterInstruction).registerA
-
-            val insertIndex = brightnessRegisterIndex + 1
-            method.addInstructions(
-                insertIndex,
-                """
-                   invoke-static {v$register}, Lapp/revanced/integrations/youtube/patches/HDRAutoBrightnessPatch;->getHDRBrightness(F)F
-                   move-result v$register
-                """,
-            )
-        }
+        // FIXME
+        // One of the changes made here effectively does nothing:
+        // It calls getHDRBrightness() and ignores the results.
+        HDRBrightnessFingerprint.result?.mutableMethod?.apply {
+            implementation!!.instructions.filter { instruction ->
+                ((instruction as? ReferenceInstruction)?.reference as? FieldReference)
+                    ?.name == "screenBrightness"
+            }.forEach { instruction ->
+                val brightnessRegisterIndex = implementation!!.instructions.indexOf(instruction)
+                val register = (instruction as TwoRegisterInstruction).registerA
+                val insertIndex = brightnessRegisterIndex + 1
+                addInstructions(
+                    insertIndex,
+                    """
+                        invoke-static {v$register}, Lapp/revanced/integrations/youtube/patches/HDRAutoBrightnessPatch;->getHDRBrightness(F)F
+                        move-result v$register
+                    """,
+                )
+            }
+        } ?: throw HDRBrightnessFingerprint.exception
    }
 }
--- a/src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt
@@ -39,9 +39,13 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt
@@ -19,9 +19,13 @@ import app.revanced.patches.youtube.video.speed.remember.RememberPlaybackSpeedPa
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37",
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ],
        ),
    ],
--- a/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuPatch.kt
@@ -35,9 +35,13 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                "18.49.37",
                "19.01.34",
                "19.02.39",
-                "19.03.35",
                "19.03.36",
-                "19.04.37"
+                "19.04.38",
+                "19.05.36",
+                "19.06.39",
+                "19.07.40",
+                "19.08.36",
+                "19.09.37"
            ]
        )
    ]
--- a/src/main/resources/addresources/values/strings.xml
+++ b/src/main/resources/addresources/values/strings.xml
@@ -199,6 +199,7 @@
            <string name="revanced_hide_merchandise_banners_title">Hide merchandise banners</string>
            <string name="revanced_hide_merchandise_banners_summary_on">Merchandise banners are hidden</string>
            <string name="revanced_hide_merchandise_banners_summary_off">Merchandise banners are shown</string>
+            <string name="revanced_hide_fullscreen_ads_feature_not_available_toast">Failed to hide full-screen ad. Disabling to prevent issues</string>
        </patch>
        <patch id="ad.getpremium.HideGetPremiumPatch">
            <string name="revanced_hide_get_premium_title">Hide YouTube Premium promotions</string>
Author	SHA1	Message	Date
semantic-release-bot	7c981f6759	chore(release): 4.4.0-dev.10 [skip ci] # [4.4.0-dev.10](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.9...v4.4.0-dev.10) (2024-03-25) ### Bug Fixes * YouTube - Hide ads: Prevent app crash if hiding fullscreen ads is not possible ([#2910](https://github.com/ReVanced/revanced-patches/issues/2910)) ([`2fcd786`](`2fcd786cc7`))	2024-03-25 16:15:34 +00:00
LisoUseInAIKyrios	2fcd786cc7	fix(YouTube - Hide ads): Prevent app crash if hiding fullscreen ads is not possible (#2910 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2024-03-25 20:13:28 +04:00
semantic-release-bot	60ace80cbd	chore(release): 4.4.0-dev.9 [skip ci] # [4.4.0-dev.9](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.8...v4.4.0-dev.9) (2024-03-18) ### Bug Fixes * TikTok: Hook application context earlier to prevent crash ([#2893](https://github.com/ReVanced/revanced-patches/issues/2893)) ([`e6a468c`](`e6a468cf7a`))	2024-03-18 00:23:31 +00:00
LisoUseInAIKyrios	e6a468cf7a	fix(TikTok): Hook application context earlier to prevent crash (#2893 )	2024-03-18 04:21:34 +04:00
semantic-release-bot	38392de4a1	chore(release): 4.4.0-dev.8 [skip ci] # [4.4.0-dev.8](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.7...v4.4.0-dev.8) (2024-03-15) ### Features * YouTube - Downloads: Use external downloader when selecting 'Download' in home feed flyout menu ([#2881](https://github.com/ReVanced/revanced-patches/issues/2881)) ([`bc8bc8c`](`bc8bc8c798`))	2024-03-15 12:35:13 +00:00
LisoUseInAIKyrios	bc8bc8c798	feat(YouTube - Downloads): Use external downloader when selecting 'Download' in home feed flyout menu (#2881 )	2024-03-15 16:33:02 +04:00
semantic-release-bot	76805e4f31	chore(release): 4.4.0-dev.7 [skip ci] # [4.4.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.6...v4.4.0-dev.7) (2024-03-14) ### Bug Fixes * YouTube - Client spoof: Spoof all user agents ([`d18719c`](`d18719c59c`))	2024-03-14 23:30:09 +00:00
oSumAtrIX	d18719c59c	fix(YouTube - Client spoof): Spoof all user agents	2024-03-15 00:28:01 +01:00
semantic-release-bot	743a02f983	chore(release): 4.4.0-dev.6 [skip ci] # [4.4.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.5...v4.4.0-dev.6) (2024-03-12) ### Features * Instagram - Hide timeline ads: Make compatible with latest versions ([`8306f70`](`8306f70fd1`))	2024-03-12 17:27:42 +00:00
oSumAtrIX	8306f70fd1	feat(Instagram - Hide timeline ads): Make compatible with latest versions	2024-03-12 18:25:23 +01:00
semantic-release-bot	5d71f23471	chore(release): 4.4.0-dev.5 [skip ci] # [4.4.0-dev.5](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.4...v4.4.0-dev.5) (2024-03-11) ### Features * YouTube: Support version `19.05`, `19.06`, `19.07`, `19.08` and `19.09` ([#2862](https://github.com/ReVanced/revanced-patches/issues/2862)) ([`122ef68`](`122ef68a4b`))	2024-03-11 13:22:02 +00:00
LisoUseInAIKyrios	122ef68a4b	feat(YouTube): Support version `19.05`, `19.06`, `19.07`, `19.08` and `19.09` (#2862 )	2024-03-11 17:20:07 +04:00