chore: Release v5.21.0-dev.2 [skip ci]

# [5.21.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.21.0-dev.1...v5.21.0-dev.2) (2025-04-16) ### Features * Add `Hide ADB status` patch ([#4585](https://github.com/ReVanced/revanced-patches/issues/4585)) ([7cc6995](7cc6995682))
feat: Add Hide ADB status patch (#4585 )
2025-12-10 03:13:56 +01:00 · 2025-04-16 08:58:30 +00:00 · 2025-04-16 10:55:07 +02:00 · 2025-04-16 08:28:15 +00:00 · 2025-04-16 10:24:35 +02:00 · 2025-04-15 16:41:52 +00:00
79 changed files with 411 additions and 146 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+# [5.21.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.21.0-dev.1...v5.21.0-dev.2) (2025-04-16)
+
+
+### Features
+
+* Add `Hide ADB status` patch ([#4585](https://github.com/ReVanced/revanced-patches/issues/4585)) ([1ea8047](https://github.com/ReVanced/revanced-patches/commit/1ea8047aefdaa358e9af8038923ac54d68a39176))
+
+# [5.21.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.20.1...v5.21.0-dev.1) (2025-04-16)
+
+
+### Features
+
+* **YouTube:** Support version `20.12.46` ([#4779](https://github.com/ReVanced/revanced-patches/issues/4779)) ([703359f](https://github.com/ReVanced/revanced-patches/commit/703359f0c16b613c204cf16cf42227b628f664fa))
+
+## [5.20.1](https://github.com/ReVanced/revanced-patches/compare/v5.20.0...v5.20.1) (2025-04-15)
+
+
+### Bug Fixes
+
+* **Spotify - Custom theme:** Support latest app target ([#4800](https://github.com/ReVanced/revanced-patches/issues/4800)) ([03d0eb2](https://github.com/ReVanced/revanced-patches/commit/03d0eb2f8c0f3e48d53bdab38d34057f2020bb65))
+
 ## [5.20.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.20.0...v5.20.1-dev.1) (2025-04-15)


--- a/extensions/all/misc/adb/hide-adb/build.gradle.kts
+++ b/extensions/all/misc/adb/hide-adb/build.gradle.kts
@@ -0,0 +1,16 @@
+android {
+    namespace = "app.revanced.extension"
+
+    defaultConfig {
+        minSdk = 21
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+}
+
+dependencies {
+    compileOnly(libs.annotation)
+}
--- a/extensions/all/misc/adb/hide-adb/src/main/AndroidManifest.xml
+++ b/extensions/all/misc/adb/hide-adb/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest/>
--- a/extensions/all/misc/adb/hide-adb/src/main/java/app/revanced/extension/all/hide/adb/HideAdbPatch.java
+++ b/extensions/all/misc/adb/hide-adb/src/main/java/app/revanced/extension/all/hide/adb/HideAdbPatch.java
@@ -0,0 +1,28 @@
+package app.revanced.extension.all.hide.adb;
+
+import android.content.ContentResolver;
+import android.provider.Settings;
+
+import java.util.Arrays;
+import java.util.List;
+
+@SuppressWarnings("unused")
+public final class HideAdbPatch {
+    private static final List<String> SPOOF_SETTINGS = Arrays.asList("adb_enabled", "adb_wifi_enabled", "development_settings_enabled");
+
+    public static int getInt(ContentResolver cr, String name) throws Settings.SettingNotFoundException {
+        if (SPOOF_SETTINGS.contains(name)) {
+            return 0;
+        }
+
+        return Settings.Global.getInt(cr, name);
+    }
+
+    public static int getInt(ContentResolver cr, String name, int def) {
+        if (SPOOF_SETTINGS.contains(name)) {
+            return 0;
+        }
+
+        return Settings.Global.getInt(cr, name, def);
+    }
+}
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M
 org.gradle.parallel = true
 android.useAndroidX = true
 kotlin.code.style = official
-version = 5.20.1-dev.1
+version = 5.21.0-dev.2
--- a/patches/api/patches.api
+++ b/patches/api/patches.api
@@ -2,6 +2,10 @@ public final class app/revanced/patches/all/misc/activity/exportall/ExportAllAct
 	public static final fun getExportAllActivitiesPatch ()Lapp/revanced/patcher/patch/ResourcePatch;
 }

+public final class app/revanced/patches/all/misc/adb/HideAdbPatchKt {
+	public static final fun getHideAdbStatusPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+}
+
 public final class app/revanced/patches/all/misc/build/BaseSpoofBuildInfoPatchKt {
 	public static final fun baseSpoofBuildInfoPatch (Lkotlin/jvm/functions/Function0;)Lapp/revanced/patcher/patch/BytecodePatch;
 }
@@ -1416,6 +1420,8 @@ public final class app/revanced/patches/youtube/misc/playservice/VersionCheckPat
 	public static final fun is_20_07_or_greater ()Z
 	public static final fun is_20_09_or_greater ()Z
 	public static final fun is_20_10_or_greater ()Z
+	public static final fun is_20_14_or_greater ()Z
+	public static final fun is_20_15_or_greater ()Z
 }

 public final class app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatchKt {
--- a/patches/src/main/kotlin/app/revanced/patches/all/misc/adb/HideAdbPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/all/misc/adb/HideAdbPatch.kt
@@ -0,0 +1,57 @@
+package app.revanced.patches.all.misc.adb
+
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patches.all.misc.transformation.transformInstructionsPatch
+import app.revanced.util.getReference
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.immutable.reference.ImmutableMethodReference
+import com.android.tools.smali.dexlib2.util.MethodUtil
+
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/all/spoof/adb/SpoofAdbPatch;"
+
+private val SETTINGS_GLOBAL_GET_INT_METHOD_REFERENCE = ImmutableMethodReference(
+    "Landroid/provider/Settings\$Global;",
+    "getInt",
+   emptyList(),
+    "I"
+)
+
+@Suppress("unused")
+val hideAdbStatusPatch = bytecodePatch(
+    name = "Hide ADB status",
+    description = "Hides enabled development settings and/or ADB.",
+    use = false,
+) {
+    extendWith("extensions/all/misc/adb/hide-adb.rve")
+
+    dependsOn(
+        transformInstructionsPatch(
+            filterMap = filterMap@{ classDef, method, instruction, instructionIndex ->
+                val reference = instruction
+                    .takeIf { it.opcode == Opcode.INVOKE_STATIC }
+                    ?.getReference<MethodReference>()
+                    ?.takeIf { MethodUtil.methodSignaturesMatch(SETTINGS_GLOBAL_GET_INT_METHOD_REFERENCE, it) }
+                    ?: return@filterMap null
+
+                Triple(instruction as Instruction35c, instructionIndex, reference.parameterTypes)
+            },
+            transform = { method, entry ->
+                val (instruction, index, parameterTypes) = entry
+                val parameterString = parameterTypes.joinToString(separator = "")
+
+                val registerString = when (parameterTypes.size) {
+                    2 -> "v${instruction.registerC}, v${instruction.registerD}"
+                    else -> "v${instruction.registerC}, v${instruction.registerD}, v${instruction.registerE}"
+                }
+
+                method.replaceInstruction(
+                    index,
+                    "invoke-static { $registerString }, $EXTENSION_CLASS_DESCRIPTOR->getInt($parameterString)I"
+                )
+            }
+        )
+    )
+}
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
@@ -84,7 +84,8 @@ val hideAdsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt
@@ -31,7 +31,8 @@ val hideGetPremiumPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt
@@ -29,7 +29,8 @@ val videoAdsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlPatch.kt
@@ -59,7 +59,8 @@ val copyVideoUrlPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt
@@ -30,7 +30,8 @@ val removeViewerDiscretionDialogPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    val extensionMethodDescriptor =
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt
@@ -74,7 +74,8 @@ val downloadsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt
@@ -10,10 +10,15 @@ import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
+import app.revanced.util.findFreeRegister
+import app.revanced.util.indexOfFirstInstructionOrThrow
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference

+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/patches/SeekbarTappingPatch;"
+
 val enableSeekbarTappingPatch = bytecodePatch(
    description = "Adds an option to enable tap to seek on the seekbar of the video player.",
 ) {
@@ -31,39 +36,37 @@ val enableSeekbarTappingPatch = bytecodePatch(
        )

        // Find the required methods to tap the seekbar.
-        val patternMatch = onTouchEventHandlerFingerprint.patternMatch!!
+        val seekbarTappingMethods = onTouchEventHandlerFingerprint.let {
+            fun getMethodReference(index: Int) = it.method.getInstruction<ReferenceInstruction>(index)
+                .reference as MethodReference

-        fun getReference(index: Int) = onTouchEventHandlerFingerprint.method.getInstruction<ReferenceInstruction>(index)
-            .reference as MethodReference
-
-        val seekbarTappingMethods = buildMap {
-            put("N", getReference(patternMatch.startIndex))
-            put("O", getReference(patternMatch.endIndex))
+            listOf(
+                getMethodReference(it.patternMatch!!.startIndex),
+                getMethodReference(it.patternMatch!!.endIndex)
+            )
        }

-        val insertIndex = seekbarTappingFingerprint.patternMatch!!.endIndex - 1
-
        seekbarTappingFingerprint.method.apply {
-            val thisInstanceRegister = getInstruction<Instruction35c>(insertIndex - 1).registerC
+            val pointIndex = indexOfNewPointInstruction(this)
+            val invokeIndex = indexOfFirstInstructionOrThrow(pointIndex, Opcode.INVOKE_VIRTUAL)
+            val insertIndex = invokeIndex + 1

-            val freeRegister = 0
-            val xAxisRegister = 2
+            val thisInstanceRegister = getInstruction<FiveRegisterInstruction>(invokeIndex).registerC
+            val xAxisRegister = this.getInstruction<FiveRegisterInstruction>(pointIndex).registerD
+            val freeRegister = findFreeRegister(insertIndex, thisInstanceRegister, xAxisRegister)

-            val oMethod = seekbarTappingMethods["O"]!!
-            val nMethod = seekbarTappingMethods["N"]!!
-
-            fun MethodReference.toInvokeInstructionString() =
-                "invoke-virtual { v$thisInstanceRegister, v$xAxisRegister }, $this"
+            val oMethod = seekbarTappingMethods[0]
+            val nMethod = seekbarTappingMethods[1]

            addInstructionsWithLabels(
                insertIndex,
                """
-                        invoke-static { }, Lapp/revanced/extension/youtube/patches/SeekbarTappingPatch;->seekbarTappingEnabled()Z
-                        move-result v$freeRegister
-                        if-eqz v$freeRegister, :disabled
-                        ${oMethod.toInvokeInstructionString()}
-                        ${nMethod.toInvokeInstructionString()}
-                    """,
+                    invoke-static { }, $EXTENSION_CLASS_DESCRIPTOR->seekbarTappingEnabled()Z
+                    move-result v$freeRegister
+                    if-eqz v$freeRegister, :disabled
+                    invoke-virtual { v$thisInstanceRegister, v$xAxisRegister }, $oMethod
+                    invoke-virtual { v$thisInstanceRegister, v$xAxisRegister }, $nMethod
+                """,
                ExternalLabel("disabled", getInstruction(insertIndex)),
            )
        }
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/Fingerprints.kt
@@ -1,11 +1,15 @@
 package app.revanced.patches.youtube.interaction.seekbar

 import app.revanced.patcher.fingerprint
+import app.revanced.util.containsLiteralInstruction
 import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstruction
+import app.revanced.util.indexOfFirstInstructionReversed
 import app.revanced.util.literal
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.Method
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 import com.android.tools.smali.dexlib2.iface.reference.StringReference

 internal val swipingUpGestureParentFingerprint = fingerprint {
@@ -101,14 +105,17 @@ internal val seekbarTappingFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
    returns("Z")
    parameters("L")
-    opcodes(
-        Opcode.IPUT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        // Insert seekbar tapping instructions here.
-        Opcode.RETURN,
-        Opcode.INVOKE_VIRTUAL,
-    )
-    literal { Integer.MAX_VALUE.toLong() }
+    custom { method, _ ->
+        method.name == "onTouchEvent"
+                && method.containsLiteralInstruction(Integer.MAX_VALUE.toLong())
+                && indexOfNewPointInstruction(method) >= 0
+    }
+}
+
+internal fun indexOfNewPointInstruction(method: Method) = method.indexOfFirstInstructionReversed {
+    val reference = getReference<MethodReference>()
+    reference?.definingClass == "Landroid/graphics/Point;"
+            && reference.name == "<init>"
 }

 internal val slideToSeekFingerprint = fingerprint {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarPatch.kt
@@ -26,6 +26,7 @@ val seekbarPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
+            "20.12.46",
        )
    )
 }
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsPatch.kt
@@ -87,7 +87,8 @@ val swipeControlsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt
@@ -28,7 +28,8 @@ val autoCaptionsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt
@@ -49,7 +49,8 @@ val customBrandingPatch = resourcePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    val appName by stringOption(
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt
@@ -47,6 +47,7 @@ val changeHeaderPatch = resourcePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
+            "20.12.46",
        )
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt
@@ -28,7 +28,8 @@ val hideButtonsPatch = resourcePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt
@@ -46,7 +46,8 @@ val navigationButtonsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/HidePlayerOverlayButtonsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/HidePlayerOverlayButtonsPatch.kt
@@ -60,7 +60,8 @@ val hidePlayerOverlayButtonsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/formfactor/ChangeFormFactorPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/formfactor/ChangeFormFactorPatch.kt
@@ -39,7 +39,8 @@ val changeFormFactorPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt
@@ -65,7 +65,8 @@ val hideEndscreenCardsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreensuggestion/HideEndScreenSuggestedVideoPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreensuggestion/HideEndScreenSuggestedVideoPatch.kt
@@ -37,7 +37,8 @@ val hideEndScreenSuggestedVideoPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt
@@ -35,7 +35,8 @@ val disableFullscreenAmbientModePatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/Fingerprints.kt
@@ -16,9 +16,22 @@ internal val hideShowMoreButtonFingerprint = fingerprint {
 }

 /**
- * 20.07+
+ * 20.12+
 */
 internal val parseElementFromBufferFingerprint = fingerprint {
+    parameters("L", "L", "[B", "L", "L")
+    opcodes(
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+    )
+    strings("Failed to parse Element") // String is a partial match.
+}
+
+/**
+ * 20.07+
+ */
+internal val parseElementFromBufferLegacy2007Fingerprint = fingerprint {
    parameters("L", "L", "[B", "L", "L")
    opcodes(
        Opcode.IGET_OBJECT,
@@ -29,7 +42,10 @@ internal val parseElementFromBufferFingerprint = fingerprint {
    strings("Failed to parse Element") // String is a partial match.
 }

-internal val parseElementFromBufferLegacyFingerprint = fingerprint {
+/**
+ * 19.01 - 20.06
+ */
+internal val parseElementFromBufferLegacy1901Fingerprint = fingerprint {
    parameters("L", "L", "[B", "L", "L")
    opcodes(
        Opcode.IGET_OBJECT,
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -21,6 +21,7 @@ import app.revanced.patches.youtube.misc.litho.filter.addLithoFilter
 import app.revanced.patches.youtube.misc.litho.filter.lithoFilterPatch
 import app.revanced.patches.youtube.misc.navigation.navigationBarHookPatch
 import app.revanced.patches.youtube.misc.playservice.is_20_07_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_20_09_or_greater
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.util.findFreeRegister
@@ -132,7 +133,8 @@ val hideLayoutComponentsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
@@ -247,8 +249,9 @@ val hideLayoutComponentsPatch = bytecodePatch(

        // region Mix playlists

-        (if (is_20_07_or_greater) parseElementFromBufferFingerprint
-        else parseElementFromBufferLegacyFingerprint).let {
+        (if (is_20_09_or_greater) parseElementFromBufferFingerprint
+        else if (is_20_07_or_greater) parseElementFromBufferLegacy2007Fingerprint
+        else parseElementFromBufferLegacy1901Fingerprint).let {
            it.method.apply {
                val byteArrayParameter = "p3"
                val startIndex = it.patternMatch!!.startIndex
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt
@@ -63,7 +63,8 @@ val hideInfoCardsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt
@@ -30,7 +30,8 @@ val hidePlayerFlyoutMenuPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt
@@ -35,7 +35,8 @@ val disableRollingNumberAnimationPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt
@@ -178,7 +178,8 @@ val hideShortsComponentsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    hideShortsAppShortcutOption()
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/Fingerprints.kt
@@ -1,24 +1,16 @@
 package app.revanced.patches.youtube.layout.hide.time

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

-internal val timeCounterFingerprint = fingerprint(
-    fuzzyPatternScanThreshold = 1,
-) {
-    returns("V")
+internal val timeCounterFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("V")
    parameters()
    opcodes(
        Opcode.SUB_LONG_2ADDR,
        Opcode.IGET_WIDE,
-        Opcode.SUB_LONG_2ADDR,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_WIDE,
-        Opcode.IGET_WIDE,
        Opcode.SUB_LONG_2ADDR
    )
 }
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt
@@ -27,7 +27,8 @@ val hideTimestampPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt
@@ -30,6 +30,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstructio
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 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
@@ -172,7 +173,8 @@ val miniplayerPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
@@ -346,7 +348,12 @@ val miniplayerPatch = bytecodePatch(
        // endregion

        // region Legacy tablet miniplayer hooks.
-        val appNameStringIndex = miniplayerOverrideFingerprint.stringMatches!!.first().index + 2
+        val appNameStringIndex = miniplayerOverrideFingerprint.let {
+            it.method.indexOfFirstInstructionOrThrow(it.stringMatches!!.first().index) {
+                val reference = getReference<MethodReference>()
+                reference?.parameterTypes?.firstOrNull() == "Landroid/content/Context;"
+            }
+        }
        navigate(miniplayerOverrideFingerprint.originalMethod).to(appNameStringIndex).stop().apply {
            findReturnIndicesReversed().forEach { index -> insertLegacyTabletMiniplayerOverride(index) }
        }
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt
@@ -27,7 +27,8 @@ val playerPopupPanelsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt
@@ -18,7 +18,8 @@ val playerControlsBackgroundPatch = resourcePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/ExitFullscreenPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/ExitFullscreenPatch.kt
@@ -27,6 +27,7 @@ internal val exitFullscreenPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
+            "20.12.46",
        )
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreenPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreenPatch.kt
@@ -27,6 +27,7 @@ val openVideosFullscreenPatch = bytecodePatch(
        "com.google.android.youtube"(
            "19.47.53",
            "20.07.39",
+            "20.12.46",
        )
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityPatch.kt
@@ -58,7 +58,8 @@ val customPlayerOverlayOpacityPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/Fingerprints.kt
@@ -1,6 +1,7 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike

 import app.revanced.patcher.fingerprint
+import app.revanced.util.literal
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode

@@ -121,3 +122,12 @@ internal val textComponentLookupFingerprint = fingerprint {
    parameters("L")
    strings("…")
 }
+
+internal const val LITHO_NEW_TEXT_COMPONENT_FEATURE_FLAG = 45675738L
+
+internal val textComponentFeatureFlagFingerprint = fingerprint {
+    accessFlags(AccessFlags.FINAL)
+    returns("Z")
+    parameters()
+    literal { LITHO_NEW_TEXT_COMPONENT_FEATURE_FLAG }
+}
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt
@@ -12,6 +12,7 @@ import app.revanced.patches.youtube.misc.litho.filter.addLithoFilter
 import app.revanced.patches.youtube.misc.litho.filter.lithoFilterPatch
 import app.revanced.patches.youtube.misc.playertype.playerTypeHookPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_33_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_20_07_or_greater
 import app.revanced.patches.youtube.misc.playservice.is_20_10_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.addSettingPreference
@@ -59,7 +60,8 @@ val returnYouTubeDislikePatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
@@ -174,6 +176,14 @@ val returnYouTubeDislikePatch = bytecodePatch(
        // Filter that parses the video id from the UI
        addLithoFilter(FILTER_CLASS_DESCRIPTOR)

+        if (is_20_07_or_greater) {
+            // Turn off a/b flag that enables new code for creating litho spans.
+            // If enabled then the litho text span hook is never called.
+            // Target code is very obfuscated and exactly what the code does is not clear.
+            // Return late so debug patch logs if the flag is enabled.
+            textComponentFeatureFlagFingerprint.method.returnLate(false)
+        }
+
        // Player response video id is needed to search for the video ids in Shorts litho components.
        hookPlayerResponseVideoId("$FILTER_CLASS_DESCRIPTOR->newPlayerResponseVideoId(Ljava/lang/String;Z)V")

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt
@@ -35,7 +35,8 @@ val wideSearchbarPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsautoplay/ShortsAutoplayPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsautoplay/ShortsAutoplayPatch.kt
@@ -39,7 +39,8 @@ val shortsAutoplayPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsplayer/OpenShortsInRegularPlayerPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsplayer/OpenShortsInRegularPlayerPatch.kt
@@ -47,7 +47,8 @@ val openShortsInRegularPlayerPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/Fingerprints.kt
@@ -20,12 +20,6 @@ internal val appendTimeFingerprint = fingerprint {
        Opcode.MOVE_RESULT_OBJECT,
        Opcode.INVOKE_STATIC,
        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.RETURN_VOID,
    )
 }

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockPatch.kt
@@ -114,7 +114,8 @@ val sponsorBlockPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt
@@ -64,7 +64,8 @@ val spoofAppVersionPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt
@@ -35,7 +35,8 @@ val changeStartPagePatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt
@@ -40,7 +40,8 @@ val disableResumingShortsOnStartupPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/Fingerprints.kt
@@ -10,13 +10,6 @@ internal val lithoThemeFingerprint = fingerprint {
    returns("V")
    parameters("Landroid/graphics/Rect;")
    opcodes(
-        Opcode.APUT,
-        Opcode.NEW_INSTANCE,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IGET_OBJECT,
-        Opcode.SGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IPUT_OBJECT,
        Opcode.IGET,
        Opcode.IF_EQZ,
        Opcode.INVOKE_VIRTUAL,
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt
@@ -223,7 +223,8 @@ val themePatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt
@@ -39,7 +39,8 @@ val alternativeThumbnailsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/BypassImageRegionRestrictionsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/BypassImageRegionRestrictionsPatch.kt
@@ -33,7 +33,8 @@ val bypassImageRegionRestrictionsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt
@@ -29,7 +29,8 @@ val announcementsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt
@@ -30,7 +30,8 @@ val autoRepeatPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/backgroundplayback/BackgroundPlaybackPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/backgroundplayback/BackgroundPlaybackPatch.kt
@@ -57,7 +57,8 @@ val backgroundPlaybackPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/EnableDebuggingPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/EnableDebuggingPatch.kt
@@ -40,7 +40,8 @@ val enableDebuggingPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt
@@ -30,7 +30,8 @@ val spoofDeviceDimensionsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dns/CheckWatchHistoryDomainNameResolutionPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dns/CheckWatchHistoryDomainNameResolutionPatch.kt
@@ -27,7 +27,8 @@ val checkWatchHistoryDomainNameResolutionPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/Fingerprints.kt
@@ -9,9 +9,7 @@ internal val onBackPressedFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
    opcodes(Opcode.RETURN_VOID)
    custom { method, classDef ->
-        method.name == "onBackPressed" &&
-            // Old versions of YouTube called this class "WatchWhileActivity" instead.
-            (classDef.endsWith("MainActivity;") || classDef.endsWith("WatchWhileActivity;"))
+        method.name == "onBackPressed" && classDef.endsWith("MainActivity;")
    }
 }

@@ -27,6 +25,9 @@ internal val scrollPositionFingerprint = fingerprint {
    strings("scroll_position")
 }

+/**
+ * Resolves using class found in [recyclerViewTopScrollingParentFingerprint].
+ */
 internal val recyclerViewTopScrollingFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
    returns("V")
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt
@@ -41,7 +41,8 @@ val gmsCoreSupportPatch = gmsCoreSupportPatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )
 }

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt
@@ -38,7 +38,8 @@ val bypassURLRedirectsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt
@@ -47,7 +47,8 @@ val openLinksExternallyPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/navigation/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/navigation/Fingerprints.kt
@@ -47,11 +47,7 @@ internal val mainActivityOnBackPressedFingerprint = fingerprint {
    returns("V")
    parameters()
    custom { method, classDef ->
-        val matchesClass = classDef.endsWith("MainActivity;") ||
-            // Old versions of YouTube called this class "WatchWhileActivity" instead.
-            classDef.endsWith("WatchWhileActivity;")
-
-        matchesClass && method.name == "onBackPressed"
+        method.name == "onBackPressed" && classDef.endsWith("MainActivity;")
    }
 }

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt
@@ -58,6 +58,10 @@ var is_20_09_or_greater = false
    private set
 var is_20_10_or_greater = false
    private set
+var is_20_14_or_greater = false
+    private set
+var is_20_15_or_greater = false
+    private set

 val versionCheckPatch = resourcePatch(
    description = "Uses the Play Store service version to find the major/minor version of the YouTube target app.",
@@ -98,5 +102,7 @@ val versionCheckPatch = resourcePatch(
        is_20_07_or_greater = 250805000 <= playStoreServicesVersion
        is_20_09_or_greater = 251006000 <= playStoreServicesVersion
        is_20_10_or_greater = 251105000 <= playStoreServicesVersion
+        is_20_14_or_greater = 251505000 <= playStoreServicesVersion
+        is_20_15_or_greater = 251605000 <= playStoreServicesVersion
    }
 }
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt
@@ -36,7 +36,8 @@ val removeTrackingQueryParameterPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/spoof/SpoofVideoStreamsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/spoof/SpoofVideoStreamsPatch.kt
@@ -9,6 +9,7 @@ import app.revanced.patches.shared.misc.spoof.spoofVideoStreamsPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_34_or_greater
 import app.revanced.patches.youtube.misc.playservice.is_20_03_or_greater
 import app.revanced.patches.youtube.misc.playservice.is_20_10_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_20_14_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
@@ -22,7 +23,8 @@ val spoofVideoStreamsPatch = spoofVideoStreamsPatch({
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    dependsOn(
@@ -33,7 +35,8 @@ val spoofVideoStreamsPatch = spoofVideoStreamsPatch({
 }, {
    is_19_34_or_greater
 }, {
-    is_20_10_or_greater
+    // In 20.14 the flag was merged with 20.03 start playback flag.
+    is_20_10_or_greater && !is_20_14_or_greater
 }, {
    is_20_03_or_greater
 }, {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/ZoomHapticsPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/ZoomHapticsPatch.kt
@@ -27,7 +27,8 @@ val zoomHapticsPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/shared/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/shared/Fingerprints.kt
@@ -33,8 +33,7 @@ internal val mainActivityFingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
    parameters()
    custom { _, classDef ->
-        // Old versions of YouTube called this class "WatchWhileActivity" instead.
-        classDef.endsWith("MainActivity;") || classDef.endsWith("WatchWhileActivity;")
+        classDef.endsWith("MainActivity;")
    }
 }

@@ -42,12 +41,7 @@ internal val mainActivityOnCreateFingerprint = fingerprint {
    returns("V")
    parameters("Landroid/os/Bundle;")
    custom { method, classDef ->
-        method.name == "onCreate" &&
-            (
-                classDef.endsWith("MainActivity;") ||
-                    // Old versions of YouTube called this class "WatchWhileActivity" instead.
-                    classDef.endsWith("WatchWhileActivity;")
-                )
+        method.name == "onCreate" && classDef.endsWith("MainActivity;")
    }
 }

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/audio/ForceOriginalAudioPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/audio/ForceOriginalAudioPatch.kt
@@ -47,7 +47,8 @@ val forceOriginalAudioPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrPatch.kt
@@ -34,7 +34,8 @@ val disableHdrPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
-        ),
+            "20.12.46",
+        )
    )

    execute {
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/information/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/information/Fingerprints.kt
@@ -117,13 +117,6 @@ internal val playbackSpeedMenuSpeedChangedFingerprint = fingerprint {
    returns("L")
    parameters("L")
    opcodes(
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
        Opcode.IGET,
        Opcode.INVOKE_VIRTUAL,
        Opcode.SGET_OBJECT,
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/Fingerprints.kt
@@ -5,9 +5,35 @@ import com.android.tools.smali.dexlib2.AccessFlags
 import org.stringtemplate.v4.compiler.Bytecode.instructions

 /**
- * For targets 20.10 and later.
+ * For targets 20.15 and later.
 */
 internal val playerParameterBuilderFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("L")
+    parameters(
+        "Ljava/lang/String;",  // VideoId.
+        "[B",
+        "Ljava/lang/String;",  // Player parameters proto buffer.
+        "Ljava/lang/String;",
+        "I",
+        "Z",
+        "I",
+        "L",
+        "Ljava/util/Set;",
+        "Ljava/lang/String;",
+        "Ljava/lang/String;",
+        "L",
+        "Z", // Appears to indicate if the video id is being opened or is currently playing.
+        "Z",
+        "Z"
+    )
+    strings("psps")
+}
+
+/**
+ * For targets 20.10 to 20.14.
+ */
+internal val playerParameterBuilder2010Fingerprint = fingerprint {
    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
    returns("L")
    parameters(
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/playerresponse/PlayerResponseMethodHookPatch.kt
@@ -9,6 +9,7 @@ import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.playservice.is_19_23_or_greater
 import app.revanced.patches.youtube.misc.playservice.is_20_02_or_greater
 import app.revanced.patches.youtube.misc.playservice.is_20_10_or_greater
+import app.revanced.patches.youtube.misc.playservice.is_20_15_or_greater
 import app.revanced.patches.youtube.misc.playservice.versionCheckPatch

 private val hooks = mutableSetOf<Hook>()
@@ -39,9 +40,12 @@ val playerResponseMethodHookPatch = bytecodePatch {

    execute {
        val fingerprint : Fingerprint
-        if (is_20_10_or_greater) {
+        if (is_20_15_or_greater) {
            parameterIsShortAndOpeningOrPlaying = 13
            fingerprint = playerParameterBuilderFingerprint
+        } else if (is_20_10_or_greater) {
+            parameterIsShortAndOpeningOrPlaying = 13
+            fingerprint = playerParameterBuilder2010Fingerprint
        } else if (is_20_02_or_greater) {
            parameterIsShortAndOpeningOrPlaying = 12
            fingerprint = playerParameterBuilder2002Fingerprint
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt
@@ -29,6 +29,7 @@ val videoQualityPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
+            "20.12.46",
        )
    )

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt
@@ -34,6 +34,7 @@ val playbackSpeedPatch = bytecodePatch(
            "19.43.41",
            "19.47.53",
            "20.07.39",
+            "20.12.46",
        )
    )

--- a/patches/src/main/kotlin/app/revanced/util/BytecodeUtils.kt
+++ b/patches/src/main/kotlin/app/revanced/util/BytecodeUtils.kt
@@ -698,29 +698,54 @@ fun BytecodePatchContext.forEachLiteralValueInstruction(
 }

 /**
- * Return the method early.
+ * Overrides the first instruction of a method with a constant return value.
+ * None of the method code will ever execute.
 */
-fun MutableMethod.returnEarly(bool: Boolean = false) {
+fun MutableMethod.returnEarly(overrideValue: Boolean = false) = overrideReturnValue(overrideValue, false)
+
+/**
+ * Overrides all return statements with a constant value.
+ * All method code is executed the same as unpatched.
+ *
+ * @see returnEarly
+ */
+internal fun MutableMethod.returnLate(overrideValue: Boolean = false) = overrideReturnValue(overrideValue, true)
+
+private fun MutableMethod.overrideReturnValue(bool: Boolean, returnLate: Boolean) {
    val const = if (bool) "0x1" else "0x0"

-    val stringInstructions = when (returnType.first()) {
-        'L' ->
+    val instructions = when (returnType.first()) {
+        'L' -> {
            """
                const/4 v0, $const
                return-object v0
            """
+        }

-        'V' -> "return-void"
-        'I', 'Z' ->
+        'V' -> {
+            if (returnLate) throw IllegalArgumentException("Cannot return late for method of void type")
+            "return-void"
+        }
+
+        'I', 'Z' -> {
            """
                const/4 v0, $const
                return v0
            """
+        }

        else -> throw Exception("Return type is not supported: $this")
    }

-    addInstructions(0, stringInstructions)
+    if (returnLate) {
+        findInstructionIndicesReversed {
+            opcode == RETURN || opcode == RETURN_OBJECT
+        }.forEach { index ->
+            addInstructionsAtControlFlowLabel(index, instructions)
+        }
+    } else {
+        addInstructions(0, instructions)
+    }
 }

 /**
Author	SHA1	Message	Date
semantic-release-bot	0559fc7fd0	chore: Release v5.21.0-dev.2 [skip ci] # [5.21.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v5.21.0-dev.1...v5.21.0-dev.2) (2025-04-16) ### Features * Add `Hide ADB status` patch ([#4585](https://github.com/ReVanced/revanced-patches/issues/4585)) ([`7cc6995`](`7cc6995682`))	2025-04-16 08:58:30 +00:00
1fexd	7cc6995682	feat: Add `Hide ADB status` patch (#4585 ) Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>	2025-04-16 10:55:07 +02:00
semantic-release-bot	476f13bf98	chore: Release v5.21.0-dev.1 [skip ci] # [5.21.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v5.20.1...v5.21.0-dev.1) (2025-04-16) ### Features * YouTube: Support version `20.12.46` ([#4779](https://github.com/ReVanced/revanced-patches/issues/4779)) ([`f216e16`](`f216e16c0b`))	2025-04-16 08:28:15 +00:00
LisoUseInAIKyrios	f216e16c0b	feat(YouTube): Support version `20.12.46` (#4779 )	2025-04-16 10:24:35 +02:00
semantic-release-bot	f2a8789649	chore: Release v5.20.1 [skip ci] ## [5.20.1](https://github.com/ReVanced/revanced-patches/compare/v5.20.0...v5.20.1) (2025-04-15) ### Bug Fixes * Spotify - Custom theme: Support latest app target ([#4800](https://github.com/ReVanced/revanced-patches/issues/4800)) ([`2393d0a`](`2393d0a8f5`))	2025-04-15 16:41:52 +00:00
LisoUseInAIKyrios	5973b64f52	chore: Merge branch `dev` to `main` (#4801 )	2025-04-15 18:38:29 +02:00