Merge 5ac5168900 into 5242cbde99

api/revanced-patches.api

@@ -319,30 +319,12 @@ public final class app/revanced/patches/music/ad/video/HideMusicVideoAds : app/r
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
-public final class app/revanced/patches/music/ad/video/MusicVideoAdsPatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/music/ad/video/MusicVideoAdsPatch;
-	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-}
-
-public final class app/revanced/patches/music/audio/codecs/CodecsUnlockPatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/music/audio/codecs/CodecsUnlockPatch;
-	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-}
-
 public final class app/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
-public final class app/revanced/patches/music/audio/exclusiveaudio/ExclusiveAudioPatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/music/audio/exclusiveaudio/ExclusiveAudioPatch;
-	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-}
-
 public final class app/revanced/patches/music/interaction/permanentrepeat/PermanentRepeatPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/music/interaction/permanentrepeat/PermanentRepeatPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -355,18 +337,6 @@ public final class app/revanced/patches/music/interaction/permanentshuffle/Perma
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
-public final class app/revanced/patches/music/interaction/permanentshuffle/PermanentShuffleTogglePatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/music/interaction/permanentshuffle/PermanentShuffleTogglePatch;
-	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-}
-
-public final class app/revanced/patches/music/layout/compactheader/CompactHeaderPatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/music/layout/compactheader/CompactHeaderPatch;
-	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-}
-
 public final class app/revanced/patches/music/layout/compactheader/HideCategoryBar : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/music/layout/compactheader/HideCategoryBar;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -413,12 +383,6 @@ public final class app/revanced/patches/music/misc/integrations/IntegrationsPatc
 	public static final field INSTANCE Lapp/revanced/patches/music/misc/integrations/IntegrationsPatch;
 }
 
-public final class app/revanced/patches/music/premium/backgroundplay/BackgroundPlayPatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/music/premium/backgroundplay/BackgroundPlayPatch;
-	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-}
-
 public final class app/revanced/patches/myexpenses/misc/pro/UnlockProPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/myexpenses/misc/pro/UnlockProPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -670,7 +634,6 @@ public abstract class app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportRes
 	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
-	protected final fun getGmsCoreVendor ()Ljava/lang/String;
 	protected final fun getGmsCoreVendorGroupId ()Ljava/lang/String;
 }
 
@@ -865,8 +828,6 @@ public final class app/revanced/patches/shared/misc/settings/preference/ListPref
 public final class app/revanced/patches/shared/misc/settings/preference/NonInteractivePreference : app/revanced/patches/shared/misc/settings/preference/BasePreference {
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
 	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getSelectable ()Z
 	public fun serialize (Lorg/w3c/dom/Document;Lkotlin/jvm/functions/Function1;)Lorg/w3c/dom/Element;
 }
@@ -1089,12 +1050,6 @@ public final class app/revanced/patches/tumblr/fixes/FixOldVersionsPatch : app/r
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
-public final class app/revanced/patches/tumblr/live/DisableTumblrLivePatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/tumblr/live/DisableTumblrLivePatch;
-	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-}
-
 public final class app/revanced/patches/tumblr/timelinefilter/TimelineFilterPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/tumblr/timelinefilter/TimelineFilterPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -1337,12 +1292,6 @@ public final class app/revanced/patches/youtube/layout/branding/header/ChangeHea
 	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
 }
 
-public final class app/revanced/patches/youtube/layout/branding/header/PremiumHeadingPatch : app/revanced/patcher/patch/ResourcePatch {
-	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/branding/header/PremiumHeadingPatch;
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
-}
-
 public final class app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch : app/revanced/patcher/patch/ResourcePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
@@ -1385,12 +1334,6 @@ public final class app/revanced/patches/youtube/layout/hide/albumcards/AlbumCard
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
-public final class app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch;
-	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-}
-
 public final class app/revanced/patches/youtube/layout/hide/comments/CommentsPatch : app/revanced/patcher/patch/ResourcePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/hide/comments/CommentsPatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
@@ -1445,12 +1388,6 @@ public final class app/revanced/patches/youtube/layout/hide/infocards/HideInfoca
 	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
 }
 
-public final class app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch;
-	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-}
-
 public final class app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch : app/revanced/patcher/patch/ResourcePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch;
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
@@ -1617,18 +1554,6 @@ public final class app/revanced/patches/youtube/misc/fix/playback/ClientSpoofPat
 	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 {
-	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch;
-	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-}
-
-public final class app/revanced/patches/youtube/misc/fix/playback/SpoofSignatureResourcePatch : app/revanced/patcher/patch/ResourcePatch {
-	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/fix/playback/SpoofSignatureResourcePatch;
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
-}
-
 public final class app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch : app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportPatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch;
 }
@@ -1751,12 +1676,6 @@ public final class app/revanced/patches/youtube/misc/zoomhaptics/ZoomHapticsPatc
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
-public final class app/revanced/patches/youtube/video/hdrbrightness/HDRBrightnessPatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/youtube/video/hdrbrightness/HDRBrightnessPatch;
-	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-}
-
 public final class app/revanced/patches/youtube/video/information/VideoInformationPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/video/information/VideoInformationPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
@@ -1832,12 +1751,6 @@ public final class app/revanced/patches/youtube/video/videoqualitymenu/RestoreOl
 	public fun execute (Lapp/revanced/patcher/data/ResourceContext;)V
 }
 
-public final class app/revanced/patches/youtubevanced/ad/general/HideAdsPatch : app/revanced/patcher/patch/BytecodePatch {
-	public static final field INSTANCE Lapp/revanced/patches/youtubevanced/ad/general/HideAdsPatch;
-	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V
-	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
-}
-
 public final class app/revanced/patches/yuka/misc/unlockpremium/UnlockPremiumPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/yuka/misc/unlockpremium/UnlockPremiumPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V

src/main/kotlin/app/revanced/patches/music/ad/video/HideMusicVideoAds.kt

@@ -27,11 +27,3 @@ object HideMusicVideoAds : BytecodePatch(
         } ?: throw ShowMusicVideoAdsParentFingerprint.exception
     }
 }
-
-@Deprecated("This patch class has been renamed to HideMusicVideoAds.")
-object MusicVideoAdsPatch : BytecodePatch(
-    dependencies = setOf(HideMusicVideoAds::class),
-) {
-    override fun execute(context: BytecodeContext) {
-    }
-}

src/main/kotlin/app/revanced/patches/music/audio/codecs/CodecsUnlockPatch.kt

@@ -1,46 +0,0 @@
-package app.revanced.patches.music.audio.codecs
-
-import app.revanced.patcher.data.BytecodeContext
-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.toInstruction
-import app.revanced.patches.music.audio.codecs.fingerprints.AllCodecsReferenceFingerprint
-import app.revanced.patches.music.audio.codecs.fingerprints.CodecsLockFingerprint
-import com.android.tools.smali.dexlib2.Opcode
-
-@Patch(
-    description = "Adds more audio codec options. The new audio codecs usually result in better audio quality.",
-    compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")],
-)
-@Deprecated("This patch is no longer needed as the feature is now enabled by default.")
-object CodecsUnlockPatch : BytecodePatch(
-    setOf(CodecsLockFingerprint, AllCodecsReferenceFingerprint),
-) {
-    override fun execute(context: BytecodeContext) {
-        val codecsLockResult = CodecsLockFingerprint.result!!
-
-        val implementation = codecsLockResult.mutableMethod.implementation!!
-
-        val scanResultStartIndex = codecsLockResult.scanResult.patternScanResult!!.startIndex
-        val instructionIndex = scanResultStartIndex +
-            if (implementation.instructions[scanResultStartIndex - 1].opcode == Opcode.CHECK_CAST) {
-                // for 5.16.xx and lower
-                -3
-            } else {
-                // since 5.17.xx
-                -2
-            }
-
-        val allCodecsResult = AllCodecsReferenceFingerprint.result!!
-        val allCodecsMethod =
-            context.toMethodWalker(allCodecsResult.method)
-                .nextMethod(allCodecsResult.scanResult.patternScanResult!!.startIndex)
-                .getMethod()
-
-        implementation.replaceInstruction(
-            instructionIndex,
-            "invoke-static {}, ${allCodecsMethod.definingClass}->${allCodecsMethod.name}()Ljava/util/Set;".toInstruction(),
-        )
-    }
-}

src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/AllCodecsReferenceFingerprint.kt

@@ -1,52 +0,0 @@
-package app.revanced.patches.music.audio.codecs.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-internal object AllCodecsReferenceFingerprint : MethodFingerprint(
-    "J", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.CONST_4,
-        Opcode.IF_EQZ,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.GOTO,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.IGET_BOOLEAN,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.GOTO,
-        Opcode.MOVE_EXCEPTION,
-        Opcode.INVOKE_SUPER,
-        Opcode.MOVE_RESULT_WIDE,
-        Opcode.RETURN_WIDE
-    ), listOf("itag")
-)

src/main/kotlin/app/revanced/patches/music/audio/codecs/fingerprints/CodecsLockFingerprint.kt

@@ -1,29 +0,0 @@
-package app.revanced.patches.music.audio.codecs.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-internal object CodecsLockFingerprint : MethodFingerprint(
-    "L", AccessFlags.PUBLIC or AccessFlags.STATIC, opcodes = listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.RETURN_OBJECT
-    ),
-    strings = listOf("eac3_supported")
-)

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback.kt

@@ -28,9 +28,4 @@ object EnableExclusiveAudioPlayback : BytecodePatch(
             )
         } ?: throw AllowExclusiveAudioPlaybackFingerprint.exception
     }
-}
-
-@Deprecated("This patch class has been renamed to EnableExclusiveAudioPlayback.")
-object ExclusiveAudioPatch : BytecodePatch(emptySet()) {
-    override fun execute(context: BytecodeContext) = EnableExclusiveAudioPlayback.execute(context)
-}
+}

src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/PermanentShufflePatch.kt

@@ -22,11 +22,3 @@ object PermanentShufflePatch : BytecodePatch(setOf(DisableShuffleFingerprint)) {
             ?: throw DisableShuffleFingerprint.exception
     }
 }
-
-@Deprecated("This patch class has been renamed to PermanentShufflePatch.")
-object PermanentShuffleTogglePatch : BytecodePatch(
-    dependencies = setOf(PermanentShufflePatch::class),
-) {
-    override fun execute(context: BytecodeContext) {
-    }
-}

src/main/kotlin/app/revanced/patches/music/layout/compactheader/HideCategoryBar.kt

@@ -37,11 +37,3 @@ object HideCategoryBar : BytecodePatch(
         } ?: throw ConstructCategoryBarFingerprint.exception
     }
 }
-
-@Deprecated("This patch class has been renamed to HideCategoryBar.")
-object CompactHeaderPatch : BytecodePatch(
-    dependencies = setOf(HideCategoryBar::class),
-) {
-    override fun execute(context: BytecodeContext) {
-    }
-}

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/BackgroundPlayPatch.kt

@@ -1,12 +0,0 @@
-package app.revanced.patches.music.premium.backgroundplay
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patches.music.layout.minimizedplayback.MinimizedPlaybackPatch
-@Deprecated("This patch has been merged into MinimizedPlaybackPatch.")
-object BackgroundPlayPatch : BytecodePatch(
-    dependencies = setOf(MinimizedPlaybackPatch::class),
-) {
-    override fun execute(context: BytecodeContext) {
-    }
-}

src/main/kotlin/app/revanced/patches/shared/misc/gms/BaseGmsCoreSupportResourcePatch.kt

@@ -39,9 +39,6 @@ abstract class BaseGmsCoreSupportResourcePatch(
 
     protected val gmsCoreVendorGroupId by gmsCoreVendorGroupIdOption
 
-    @Deprecated("Use gmsCoreVendorGroupId instead.", ReplaceWith("gmsCoreVendorGroupId"))
-    protected val gmsCoreVendor by gmsCoreVendorGroupIdOption
-
     override fun execute(context: ResourceContext) {
         AddResourcesPatch(BaseGmsCoreSupportResourcePatch::class)
 

src/main/kotlin/app/revanced/patches/shared/misc/settings/preference/NonInteractivePreference.kt

@@ -22,14 +22,6 @@ class NonInteractivePreference(
     val selectable: Boolean = false
 ) : BasePreference(key, titleKey, summaryKey, tag) {
 
-    @Deprecated("Here only for binary compatibility, and should be removed after the next major version update.")
-    constructor(
-        key: String,
-        summaryKey: String? = "${key}_summary",
-        tag: String = "Preference",
-        selectable: Boolean = false
-    ) : this(key, "${key}_title", summaryKey, tag, selectable)
-
     override fun serialize(ownerDocument: Document, resourceCallback: (BaseResource) -> Unit) =
         super.serialize(ownerDocument, resourceCallback).apply {
             setAttribute("android:selectable", selectable.toString())

src/main/kotlin/app/revanced/patches/tumblr/live/DisableTumblrLivePatch.kt

@@ -1,26 +0,0 @@
-package app.revanced.patches.tumblr.live
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.tumblr.featureflags.OverrideFeatureFlagsPatch
-import app.revanced.patches.tumblr.timelinefilter.TimelineFilterPatch
-
-@Patch(
-    description = "Disable the Tumblr Live tab button and dashboard carousel.",
-    dependencies = [OverrideFeatureFlagsPatch::class, TimelineFilterPatch::class],
-    compatiblePackages = [CompatiblePackage("com.tumblr")],
-)
-@Deprecated("Tumblr Live was removed and is no longer served in the feed, making this patch useless.")
-@Suppress("unused")
-object DisableTumblrLivePatch : BytecodePatch(emptySet()) {
-    override fun execute(context: BytecodeContext) {
-        // Hide the LIVE_MARQUEE timeline element that appears in the feed
-        // Called "live_marquee" in api response
-        TimelineFilterPatch.addObjectTypeFilter("LIVE_MARQUEE")
-
-        // Hide the Tab button for Tumblr Live by forcing the feature flag to false
-        OverrideFeatureFlagsPatch.addOverride("liveStreaming", "false")
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/PremiumHeadingPatch.kt

@@ -1,9 +0,0 @@
-package app.revanced.patches.youtube.layout.branding.header
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.ResourcePatch
-
-@Deprecated("Use PremiumHeadingPatch instead.")
-object PremiumHeadingPatch : ResourcePatch() {
-    override fun execute(context: ResourceContext) = ChangeHeaderPatch.execute(context)
-}

src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch.kt

@@ -1,13 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.breakingnews
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patches.youtube.layout.hide.general.HideLayoutComponentsPatch
-
-@Deprecated("This patch has been merged to HideLayoutComponentsPatch.")
-object BreakingNewsPatch : BytecodePatch(
-    dependencies = setOf(HideLayoutComponentsPatch::class),
-) {
-    override fun execute(context: BytecodeContext) {
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch.kt

@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.layout.hide.loadmorebutton
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patches.youtube.layout.hide.general.HideLayoutComponentsPatch
-
-@Deprecated("This patch class has been merged into HideLayoutComponentsPatch.")
-object HideLoadMoreButtonPatch : BytecodePatch(
-    dependencies = setOf(HideLayoutComponentsPatch::class)
-) {
-    override fun execute(context: BytecodeContext) {}
-}

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt

@@ -1,7 +1,6 @@
 package app.revanced.patches.youtube.layout.returnyoutubedislike
 
 import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
@@ -10,9 +9,10 @@ import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.all.misc.resources.AddResourcesPatch
+import app.revanced.patches.shared.misc.settings.preference.IntentPreference
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.ConversionContextFingerprint
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.DislikeFingerprint
-import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.DislikesOldLayoutTextViewFingerprint
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.LikeFingerprint
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.RemoveLikeFingerprint
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.RollingNumberMeasureAnimatedTextFingerprint
@@ -24,9 +24,10 @@ import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.Sho
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.TextComponentConstructorFingerprint
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.TextComponentDataFingerprint
 import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.TextComponentLookupFingerprint
-import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.litho.filter.LithoFilterPatch
 import app.revanced.patches.youtube.misc.playertype.PlayerTypeHookPatch
+import app.revanced.patches.youtube.misc.settings.SettingsPatch
+import app.revanced.patches.youtube.misc.settings.SettingsResourcePatch
 import app.revanced.patches.youtube.shared.fingerprints.RollingNumberTextViewAnimationUpdateFingerprint
 import app.revanced.patches.youtube.video.videoid.VideoIdPatch
 import app.revanced.util.exception
@@ -46,10 +47,9 @@ import com.android.tools.smali.dexlib2.iface.reference.TypeReference
     name = "Return YouTube Dislike",
     description = "Adds an option to show the dislike count of videos using the Return YouTube Dislike API.",
     dependencies = [
-        IntegrationsPatch::class,
+        SettingsPatch::class,
         LithoFilterPatch::class,
         VideoIdPatch::class,
-        ReturnYouTubeDislikeResourcePatch::class,
         PlayerTypeHookPatch::class,
     ],
     compatiblePackages = [
@@ -78,7 +78,6 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
         TextComponentConstructorFingerprint,
         TextComponentDataFingerprint,
         ShortsTextViewFingerprint,
-        DislikesOldLayoutTextViewFingerprint,
         LikeFingerprint,
         DislikeFingerprint,
         RemoveLikeFingerprint,
@@ -96,6 +95,15 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
         "Lapp/revanced/integrations/youtube/patches/components/ReturnYouTubeDislikeFilterPatch;"
 
     override fun execute(context: BytecodeContext) {
+        AddResourcesPatch(this::class)
+
+        SettingsResourcePatch += IntentPreference(
+            key = "revanced_settings_screen_09",
+            titleKey = "revanced_ryd_settings_title",
+            summaryKey = null,
+            intent = SettingsPatch.newIntent("revanced_ryd_settings_intent"),
+        )
+
         // region Inject newVideoLoaded event handler to update dislikes when a new video is loaded.
 
         VideoIdPatch.hookVideoId("$INTEGRATIONS_CLASS_DESCRIPTOR->newVideoLoaded(Ljava/lang/String;)V")
@@ -226,25 +234,6 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
 
         // endregion
 
-        // region Hook old UI layout dislikes, for the older app spoofs used with spoof-app-version.
-
-        DislikesOldLayoutTextViewFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val startIndex = it.scanResult.patternScanResult!!.startIndex
-
-                val resourceIdentifierRegister = getInstruction<OneRegisterInstruction>(startIndex).registerA
-                val textViewRegister = getInstruction<OneRegisterInstruction>(startIndex + 4).registerA
-
-                addInstruction(
-                    startIndex + 4,
-                    "invoke-static {v$resourceIdentifierRegister, v$textViewRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->setOldUILayoutDislikes(ILandroid/widget/TextView;)V"
-                )
-            }
-        } ?: throw DislikesOldLayoutTextViewFingerprint.exception
-
-        // endregion
-
-
         // region Hook rolling numbers.
 
         // Do this last to allow patching old unsupported versions (if the user really wants),

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikeResourcePatch.kt

@@ -1,36 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.all.misc.resources.AddResourcesPatch
-import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
-import app.revanced.patches.shared.misc.settings.preference.IntentPreference
-import app.revanced.patches.youtube.misc.settings.SettingsPatch
-import app.revanced.patches.youtube.misc.settings.SettingsResourcePatch
-
-@Patch(
-    dependencies = [
-        SettingsPatch::class,
-        AddResourcesPatch::class,
-    ],
-)
-internal object ReturnYouTubeDislikeResourcePatch : ResourcePatch() {
-    internal var oldUIDislikeId: Long = -1
-
-    override fun execute(context: ResourceContext) {
-        AddResourcesPatch(this::class)
-
-        SettingsResourcePatch += IntentPreference(
-            key = "revanced_settings_screen_09",
-            titleKey = "revanced_ryd_settings_title",
-            summaryKey = null,
-            intent = SettingsPatch.newIntent("revanced_ryd_settings_intent"),
-        )
-
-        oldUIDislikeId = ResourceMappingPatch[
-            "id",
-            "dislike_button",
-        ]
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikesOldLayoutTextViewFingerprint.kt

@@ -1,22 +0,0 @@
-package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.layout.returnyoutubedislike.ReturnYouTubeDislikeResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object DislikesOldLayoutTextViewFingerprint : LiteralValueFingerprint(
-    returnType = "V",
-    parameters = listOf("L"),
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    opcodes = listOf(
-        Opcode.CONST, // resource identifier register
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ, // textview register
-        Opcode.GOTO,
-    ),
-    literalSupplier = { ReturnYouTubeDislikeResourcePatch.oldUIDislikeId }
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignaturePatch.kt

@@ -1,239 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patcher.util.smali.ExternalLabel
-import app.revanced.patches.all.misc.resources.AddResourcesPatch
-import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen
-import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen.Sorting
-import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
-import app.revanced.patches.youtube.misc.fix.playback.fingerprints.*
-import app.revanced.patches.youtube.misc.playertype.PlayerTypeHookPatch
-import app.revanced.patches.youtube.misc.settings.SettingsPatch
-import app.revanced.patches.youtube.video.information.VideoInformationPatch
-import app.revanced.patches.youtube.video.playerresponse.PlayerResponseMethodHookPatch
-import app.revanced.util.exception
-import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
-import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
-
-@Patch(
-    description = "Spoofs the signature to prevent playback issues.",
-    dependencies = [
-        SettingsPatch::class,
-        PlayerTypeHookPatch::class,
-        PlayerResponseMethodHookPatch::class,
-        VideoInformationPatch::class,
-        SpoofSignatureResourcePatch::class,
-        AddResourcesPatch::class,
-    ],
-)
-@Deprecated("This patch will be removed in the future.")
-object SpoofSignaturePatch : BytecodePatch(
-    setOf(
-        PlayerResponseModelImplGeneralFingerprint,
-        PlayerResponseModelImplLiveStreamFingerprint,
-        PlayerResponseModelImplRecommendedLevelFingerprint,
-        StoryboardRendererSpecFingerprint,
-        StoryboardRendererDecoderSpecFingerprint,
-        StoryboardRendererDecoderRecommendedLevelFingerprint,
-        StoryboardThumbnailParentFingerprint,
-        ScrubbedPreviewLayoutFingerprint,
-        StatsQueryParameterFingerprint,
-        ParamsMapPutFingerprint,
-    ),
-) {
-    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
-        "Lapp/revanced/integrations/youtube/patches/spoof/SpoofSignaturePatch;"
-
-    override fun execute(context: BytecodeContext) {
-        AddResourcesPatch(this::class)
-
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
-            PreferenceScreen(
-                key = "revanced_spoof_signature_verification_screen",
-                sorting = Sorting.UNSORTED,
-                preferences = setOf(
-                    SwitchPreference("revanced_spoof_signature_verification_enabled"),
-                    SwitchPreference("revanced_spoof_signature_in_feed_enabled"),
-                    SwitchPreference("revanced_spoof_storyboard"),
-                ),
-            ),
-        )
-
-        // Hook the player parameters.
-        PlayerResponseMethodHookPatch += PlayerResponseMethodHookPatch.Hook.ProtoBufferParameter(
-            "$INTEGRATIONS_CLASS_DESCRIPTOR->spoofParameter(Ljava/lang/String;Z)Ljava/lang/String;",
-        )
-
-        // Force the seekbar time and chapters to always show up.
-        // This is used if the storyboard spec fetch fails, for viewing paid videos,
-        // or if storyboard spoofing is turned off.
-        StoryboardThumbnailParentFingerprint.result?.classDef?.let { classDef ->
-            StoryboardThumbnailFingerprint.also {
-                it.resolve(
-                    context,
-                    classDef,
-                )
-            }.result?.let {
-                val endIndex = it.scanResult.patternScanResult!!.endIndex
-                // Replace existing instruction to preserve control flow label.
-                // The replaced return instruction always returns false
-                // (it is the 'no thumbnails found' control path),
-                // so there is no need to pass the existing return value to integrations.
-                it.mutableMethod.replaceInstruction(
-                    endIndex,
-                    """
-                        invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->getSeekbarThumbnailOverrideValue()Z
-                    """,
-                )
-                // Since this is end of the method must replace one line then add the rest.
-                it.mutableMethod.addInstructions(
-                    endIndex + 1,
-                    """
-                    move-result v0
-                    return v0
-                """,
-                )
-            } ?: throw StoryboardThumbnailFingerprint.exception
-        }
-
-        // If storyboard spoofing is turned off, then hide the empty seekbar thumbnail view.
-        ScrubbedPreviewLayoutFingerprint.result?.apply {
-            val endIndex = scanResult.patternScanResult!!.endIndex
-            mutableMethod.apply {
-                val imageViewFieldName = getInstruction<ReferenceInstruction>(endIndex).reference
-                addInstructions(
-                    implementation!!.instructions.lastIndex,
-                    """
-                        iget-object v0, p0, $imageViewFieldName   # copy imageview field to a register
-                        invoke-static {v0}, $INTEGRATIONS_CLASS_DESCRIPTOR->seekbarImageViewCreated(Landroid/widget/ImageView;)V
-                    """,
-                )
-            }
-        } ?: throw ScrubbedPreviewLayoutFingerprint.exception
-
-        /**
-         * Hook StoryBoard renderer url
-         */
-        arrayOf(
-            PlayerResponseModelImplGeneralFingerprint,
-            PlayerResponseModelImplLiveStreamFingerprint,
-        ).forEach { fingerprint ->
-            fingerprint.result?.let {
-                it.mutableMethod.apply {
-                    val getStoryBoardIndex = it.scanResult.patternScanResult!!.endIndex
-                    val getStoryBoardRegister =
-                        getInstruction<OneRegisterInstruction>(getStoryBoardIndex).registerA
-
-                    addInstructions(
-                        getStoryBoardIndex,
-                        """
-                        invoke-static { v$getStoryBoardRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardRendererSpec(Ljava/lang/String;)Ljava/lang/String;
-                        move-result-object v$getStoryBoardRegister
-                    """,
-                    )
-                }
-            } ?: throw fingerprint.exception
-        }
-
-        // Hook recommended seekbar thumbnails quality level.
-        StoryboardRendererDecoderRecommendedLevelFingerprint.result?.let {
-            val moveOriginalRecommendedValueIndex = it.scanResult.patternScanResult!!.endIndex
-            val originalValueRegister = it.mutableMethod
-                .getInstruction<OneRegisterInstruction>(moveOriginalRecommendedValueIndex).registerA
-
-            it.mutableMethod.addInstructions(
-                moveOriginalRecommendedValueIndex + 1,
-                """
-                        invoke-static { v$originalValueRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getRecommendedLevel(I)I
-                        move-result v$originalValueRegister
-                """,
-            )
-        } ?: throw StoryboardRendererDecoderRecommendedLevelFingerprint.exception
-
-        // Hook the recommended precise seeking thumbnails quality level.
-        PlayerResponseModelImplRecommendedLevelFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val moveOriginalRecommendedValueIndex = it.scanResult.patternScanResult!!.endIndex
-                val originalValueRegister =
-                    getInstruction<OneRegisterInstruction>(moveOriginalRecommendedValueIndex).registerA
-
-                addInstructions(
-                    moveOriginalRecommendedValueIndex,
-                    """
-                        invoke-static { v$originalValueRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getRecommendedLevel(I)I
-                        move-result v$originalValueRegister
-                        """,
-                )
-            }
-        } ?: throw PlayerResponseModelImplRecommendedLevelFingerprint.exception
-
-        StoryboardRendererSpecFingerprint.result?.let {
-            it.mutableMethod.apply {
-                val storyBoardUrlParams = 0
-
-                addInstructionsWithLabels(
-                    0,
-                    """
-                        if-nez p$storyBoardUrlParams, :ignore
-                        invoke-static { p$storyBoardUrlParams }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardRendererSpec(Ljava/lang/String;)Ljava/lang/String;
-                        move-result-object p$storyBoardUrlParams
-                    """,
-                    ExternalLabel("ignore", getInstruction(0)),
-                )
-            }
-        } ?: throw StoryboardRendererSpecFingerprint.exception
-
-        // Hook the seekbar thumbnail decoder and use a NULL spec for live streams.
-        StoryboardRendererDecoderSpecFingerprint.result?.let {
-            val storyBoardUrlIndex = it.scanResult.patternScanResult!!.startIndex + 1
-            val storyboardUrlRegister =
-                it.mutableMethod.getInstruction<OneRegisterInstruction>(storyBoardUrlIndex).registerA
-
-            it.mutableMethod.addInstructions(
-                storyBoardUrlIndex + 1,
-                """
-                        invoke-static { v$storyboardUrlRegister }, $INTEGRATIONS_CLASS_DESCRIPTOR->getStoryboardDecoderRendererSpec(Ljava/lang/String;)Ljava/lang/String;
-                        move-result-object v$storyboardUrlRegister
-                """,
-            )
-        } ?: throw StoryboardRendererDecoderSpecFingerprint.exception
-
-        // Fix stats not being tracked.
-        // Due to signature spoofing "adformat" is present in query parameters made for /stats requests,
-        // even though, for regular videos, it should not be.
-        // This breaks stats tracking.
-        // Replace the ad parameter with the video parameter in the query parameters.
-        StatsQueryParameterFingerprint.result?.let {
-            val putMethod = ParamsMapPutFingerprint.result?.method?.toString()
-                ?: throw ParamsMapPutFingerprint.exception
-
-            it.mutableMethod.apply {
-                val adParamIndex = it.scanResult.stringsScanResult!!.matches.first().index
-                val videoParamIndex = adParamIndex + 3
-
-                // Replace the ad parameter with the video parameter.
-                replaceInstruction(adParamIndex, getInstruction(videoParamIndex))
-
-                // Call paramsMap.put instead of paramsMap.putIfNotExist
-                // because the key is already present in the map.
-                val putAdParamIndex = adParamIndex + 1
-                val putIfKeyNotExistsInstruction = getInstruction<FiveRegisterInstruction>(putAdParamIndex)
-                replaceInstruction(
-                    putAdParamIndex,
-                    "invoke-virtual { " +
-                        "v${putIfKeyNotExistsInstruction.registerC}, " +
-                        "v${putIfKeyNotExistsInstruction.registerD}, " +
-                        "v${putIfKeyNotExistsInstruction.registerE} }, " +
-                        putMethod,
-                )
-            }
-        } ?: throw StatsQueryParameterFingerprint.exception
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofSignatureResourcePatch.kt

@@ -1,19 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback
-
-import app.revanced.patcher.data.ResourceContext
-import app.revanced.patcher.patch.ResourcePatch
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
-import app.revanced.patches.youtube.misc.settings.SettingsPatch
-
-@Patch(dependencies = [SettingsPatch::class, ResourceMappingPatch::class])
-object SpoofSignatureResourcePatch : ResourcePatch() {
-    internal var scrubbedPreviewThumbnailResourceId: Long = -1
-
-    override fun execute(context: ResourceContext) {
-        scrubbedPreviewThumbnailResourceId = ResourceMappingPatch[
-            "id",
-            "thumbnail",
-        ]
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ParamsMapPutFingerprint.kt

@@ -1,24 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.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 ParamsMapPutFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf(
-        "Ljava/lang/String;",
-        "Ljava/lang/String;",
-    ),
-    opcodes = listOf(
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.MOVE_OBJECT,
-        Opcode.MOVE_OBJECT,
-        Opcode.MOVE_OBJECT,
-        Opcode.INVOKE_DIRECT_RANGE,
-    ),
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplGeneralFingerprint.kt

@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.util.containsWideLiteralInstructionValue
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object PlayerResponseModelImplGeneralFingerprint : MethodFingerprint(
-    returnType = "Ljava/lang/String;",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = emptyList(),
-    opcodes = listOf(
-        Opcode.RETURN_OBJECT,
-        Opcode.CONST_4,
-        Opcode.RETURN_OBJECT
-    ),
-    customFingerprint = handler@{ methodDef, _ ->
-        if (!methodDef.definingClass.endsWith("/PlayerResponseModelImpl;")) return@handler false
-
-        methodDef.containsWideLiteralInstructionValue(55735497)
-    }
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplLiveStreamFingerprint.kt

@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.util.containsWideLiteralInstructionValue
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object PlayerResponseModelImplLiveStreamFingerprint : MethodFingerprint(
-    returnType = "Ljava/lang/String;",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = emptyList(),
-    opcodes = listOf(
-        Opcode.RETURN_OBJECT,
-        Opcode.CONST_4,
-        Opcode.RETURN_OBJECT
-    ),
-    customFingerprint = handler@{ methodDef, _ ->
-        if (!methodDef.definingClass.endsWith("/PlayerResponseModelImpl;")) return@handler false
-
-        methodDef.containsWideLiteralInstructionValue(70276274)
-    }
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/PlayerResponseModelImplRecommendedLevelFingerprint.kt

@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.util.containsWideLiteralInstructionValue
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object PlayerResponseModelImplRecommendedLevelFingerprint : MethodFingerprint(
-    returnType = "I",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = emptyList(),
-    opcodes = listOf(
-        Opcode.SGET_OBJECT,
-        Opcode.IGET,
-        Opcode.RETURN
-    ),
-    customFingerprint = handler@{ methodDef, _ ->
-        if (!methodDef.definingClass.endsWith("/PlayerResponseModelImpl;")) return@handler false
-
-        methodDef.containsWideLiteralInstructionValue(55735497)
-    }
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ScrubbedPreviewLayoutFingerprint.kt

@@ -1,27 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patches.youtube.misc.fix.playback.SpoofSignatureResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object ScrubbedPreviewLayoutFingerprint : LiteralValueFingerprint(
-    accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
-    returnType = "V",
-    parameters = listOf("Landroid/content/Context;", "Landroid/util/AttributeSet;", "I", "I"),
-    opcodes = listOf(
-        Opcode.INVOKE_STATIC,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.CONST,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.IPUT_OBJECT, // preview imageview
-    ),
-    // This resource is used in ~ 40 different locations, but this method has a distinct list of parameters to match to.
-    literalSupplier = { SpoofSignatureResourcePatch.scrubbedPreviewThumbnailResourceId }
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StatsQueryParameterFingerprint.kt

@@ -1,7 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-
-internal object StatsQueryParameterFingerprint : MethodFingerprint(
-    strings = listOf("adunit"),
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardRendererDecoderRecommendedLevelFingerprint.kt

@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.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
-
-/**
- * Resolves to the same method as [StoryboardRendererDecoderSpecFingerprint].
- */
-internal object StoryboardRendererDecoderRecommendedLevelFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("Lcom/google/android/libraries/youtube/innertube/model/player/PlayerResponseModel;"),
-    opcodes = listOf(
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT
-    ),
-    strings = listOf("#-1#")
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardRendererDecoderSpecFingerprint.kt

@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.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
-
-/**
-* Resolves to the same method as [StoryboardRendererDecoderRecommendedLevelFingerprint].
-*/
-internal object StoryboardRendererDecoderSpecFingerprint : MethodFingerprint(
-    returnType = "V",
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters = listOf("Lcom/google/android/libraries/youtube/innertube/model/player/PlayerResponseModel;"),
-    opcodes = listOf(
-        Opcode.INVOKE_INTERFACE, // First instruction of the method.
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CONST_4,
-        Opcode.CONST_4,
-        Opcode.IF_NEZ,
-    ),
-    strings = listOf("#-1#")
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardRendererSpecFingerprint.kt

@@ -1,12 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-internal object StoryboardRendererSpecFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
-    returnType = "L",
-    parameters = listOf("Ljava/lang/String;", "J"),
-    strings = listOf("\\|"),
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardThumbnailFingerprint.kt

@@ -1,23 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.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
-
-/**
- * Resolves using the class found in [StoryboardThumbnailParentFingerprint].
- */
-internal object StoryboardThumbnailFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "Z",
-    parameters = listOf(),
-    opcodes = listOf(
-        Opcode.MOVE_RESULT,
-        Opcode.IF_GTZ,
-        Opcode.GOTO,
-        Opcode.CONST_4,
-        Opcode.RETURN,
-        Opcode.RETURN, // Last instruction of method.
-    ),
-)

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/StoryboardThumbnailParentFingerprint.kt

@@ -1,17 +0,0 @@
-package app.revanced.patches.youtube.misc.fix.playback.fingerprints
-
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.AccessFlags
-
-/**
- * Here lies code that creates the seekbar thumbnails.
- *
- * An additional change here might force the thumbnails to be created,
- * or possibly a change somewhere else (maybe involving YouTube 18.23.35 class `hte`)
- */
-internal object StoryboardThumbnailParentFingerprint : MethodFingerprint(
-    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    returnType = "Landroid/graphics/Bitmap;",
-    strings = listOf("Storyboard regionDecoder.decodeRegion exception - "),
-)

src/main/kotlin/app/revanced/patches/youtube/video/hdrbrightness/HDRBrightnessPatch.kt

@@ -1,81 +0,0 @@
-package app.revanced.patches.youtube.video.hdrbrightness
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.all.misc.resources.AddResourcesPatch
-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
-
-@Deprecated("Patch is obsolete and the hooked code is no longer present in 19.09+")
-@Patch(
-    description = "Adds an option to make the brightness of HDR videos follow the system default.",
-    dependencies = [IntegrationsPatch::class, SettingsPatch::class, AddResourcesPatch::class],
-    compatiblePackages = [
-        CompatiblePackage(
-            "com.google.android.youtube",
-            [
-                "18.32.39",
-                "18.37.36",
-                "18.38.44",
-                "18.43.45",
-                "18.44.41",
-                "18.45.43",
-                "18.48.39",
-                "18.49.37",
-                "19.01.34",
-                "19.02.39",
-                "19.03.36",
-                "19.04.38",
-                "19.05.36",
-                "19.06.39",
-                "19.07.40",
-                "19.08.36",
-                // 19.09+ is dramatically different and the patched code is not present.
-            ]
-        )
-    ]
-)
-@Suppress("unused")
-object HDRBrightnessPatch : BytecodePatch(
-    setOf(HDRBrightnessFingerprint),
-) {
-    override fun execute(context: BytecodeContext) {
-        AddResourcesPatch(this::class)
-
-        if (HDRBrightnessFingerprint.result == null) throw HDRBrightnessFingerprint.exception
-
-        SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
-            SwitchPreference("revanced_hdr_auto_brightness"),
-        )
-
-        // 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
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/video/hdrbrightness/fingerprints/HDRBrightnessFingerprint.kt

@@ -1,10 +0,0 @@
-package app.revanced.patches.youtube.video.hdrbrightness.fingerprints
-
-import app.revanced.patcher.fingerprint.MethodFingerprint
-import com.android.tools.smali.dexlib2.Opcode
-
-internal object HDRBrightnessFingerprint : MethodFingerprint(
-    "V",
-    opcodes = listOf(Opcode.CMPL_FLOAT),
-    strings = listOf("c.SettingNotFound;", "screen_brightness", "android.mediaview"),
-)

src/main/kotlin/app/revanced/patches/youtubevanced/ad/general/HideAdsPatch.kt

@@ -1,57 +0,0 @@
-package app.revanced.patches.youtubevanced.ad.general
-
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
-import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.annotation.CompatiblePackage
-import app.revanced.patcher.patch.annotation.Patch
-import app.revanced.patches.shared.misc.fix.verticalscroll.VerticalScrollPatch
-import app.revanced.patches.youtubevanced.ad.general.fingerprints.ContainsAdFingerprint
-import app.revanced.util.exception
-import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
-
-@Deprecated("This patch is going to be removed in the future.")
-@Patch(
-    description = "Removes general ads.",
-    dependencies = [VerticalScrollPatch::class],
-    compatiblePackages = [CompatiblePackage("com.vanced.android.youtube")],
-    use = false,
-)
-@Suppress("unused")
-object HideAdsPatch : BytecodePatch(
-    setOf(ContainsAdFingerprint),
-) {
-    override fun execute(context: BytecodeContext) {
-        ContainsAdFingerprint.result?.let { result ->
-            result.mutableMethod.apply {
-                val insertIndex = result.scanResult.patternScanResult!!.endIndex + 1
-                val adsListRegister = getInstruction<Instruction21c>(insertIndex - 2).registerA
-
-                listOf(
-                    "_buttoned_layout",
-                    "full_width_square_image_layout",
-                    "_ad_with",
-                    "landscape_image_wide_button_layout",
-                    "banner_text_icon",
-                    "cell_divider",
-                    "square_image_layout",
-                    "watch_metadata_app_promo",
-                    "video_display_full_layout",
-                    "hero_promo_image",
-                    "statement_banner",
-                    "primetime_promo",
-                    "carousel_footered_layout",
-                ).forEach { component ->
-                    addInstructions(
-                        insertIndex,
-                        """
-                           const-string v$adsListRegister, "$component"
-                           invoke-interface {v0, v$adsListRegister}, Ljava/util/List;->add(Ljava/lang/Object;)Z
-                        """,
-                    )
-                }
-            }
-        } ?: throw ContainsAdFingerprint.exception
-    }
-}

src/main/kotlin/app/revanced/patches/youtubevanced/ad/general/fingerprints/ContainsAdFingerprint.kt

@@ -1,24 +0,0 @@
-package app.revanced.patches.youtubevanced.ad.general.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 ContainsAdFingerprint: MethodFingerprint(
-    returnType = "Z",
-    parameters = listOf("L", "L"),
-    accessFlags = AccessFlags.STATIC or AccessFlags.PUBLIC,
-    opcodes = listOf(
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.CONST_STRING,
-        Opcode.INVOKE_INTERFACE
-    ),
-    strings = listOf("ads_video_with_context"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.name == "containsAd" && methodDef.definingClass.endsWith("LithoAdRemoval;")
-    }
-)

src/main/resources/addresources/values/strings.xml

@@ -658,7 +658,7 @@
             <string name="revanced_player_overlay_opacity_title">Player overlay opacity</string>
             <string name="revanced_player_overlay_opacity_summary">Opacity value between 0-100, where 0 is transparent</string>
         </patch>
-        <patch id="layout.returnyoutubedislike.ReturnYouTubeDislikeResourcePatch">
+        <patch id="layout.returnyoutubedislike.ReturnYouTubeDislikePatch">
             <string name="revanced_ryd_settings_title">Return YouTube Dislike</string>
             <string name="revanced_ryd_video_likes_hidden_by_video_owner">Hidden</string>
             <!-- Toast shown if network connection times out. Translations of this should not be longer than the original English or the text can be clipped and not entirely shown. -->
@@ -1084,29 +1084,6 @@
             <string name="revanced_slide_to_seek_summary_on">Slide to seek is enabled</string>
             <string name="revanced_slide_to_seek_summary_off">Slide to seek is not enabled</string>
         </patch>
-        <!-- This patch is no longer used, these strings are not in use, and these strings will be deleted in the future. -->
-        <patch id="misc.fix.playback.SpoofSignaturePatch">
-            <string name="revanced_spoof_signature_verification_screen_title">Spoof app signature</string>
-            <string name="revanced_spoof_signature_verification_screen_summary">Spoof the app signature to prevent playback issues</string>
-            <string name="revanced_spoof_signature_verification_enabled_title">Spoof app signature</string>
-            <string name="revanced_spoof_signature_verification_enabled_summary_on">App signature spoofed\n\nSide effects include:\n• Enhanced bitrate is not available\n• Videos cannot be downloaded\n• No seekbar thumbnails for paid videos</string>
-            <string name="revanced_spoof_signature_verification_enabled_summary_off">App signature not spoofed\n\nVideo playback may not work</string>
-            <string name="revanced_spoof_signature_verification_enabled_user_dialog_message">Turning off this setting will cause video playback issues.</string>
-            <string name="revanced_spoof_signature_in_feed_enabled_title">Spoof app signature in feed</string>
-            <string name="revanced_spoof_signature_in_feed_enabled_summary_on">App signature spoofed\n\nSide effects include:\n• Feed videos are missing subtitles\n• Automatically played feed videos will show up in your watch history</string>
-            <string name="revanced_spoof_signature_in_feed_enabled_summary_off">App signature not spoofed for feed videos\n\nFeed videos will play for less than 1 minute before encountering playback issues</string>
-            <string name="revanced_spoof_storyboard_title">Spoof storyboard</string>
-            <string name="revanced_spoof_storyboard_summary_on">Storyboard spoofed</string>
-            <string name="revanced_spoof_storyboard_summary_off">Storyboard not spoofed\n\nSide effects include:\n• No ambient mode\n• Seekbar thumbnails are hidden</string>
-            <string name="revanced_spoof_storyboard_timeout">Spoof storyboard temporarily not available (API timed out)</string>
-            <string name="revanced_spoof_storyboard_io_exception">Spoof storyboard temporarily not available: %s</string>
-        </patch>
-        <!-- This patch is no longer used and these strings will soon be deleted. -->
-        <patch id="video.hdrbrightness.HDRBrightnessPatch">
-            <string name="revanced_hdr_auto_brightness_title">Enable auto HDR brightness</string>
-            <string name="revanced_hdr_auto_brightness_summary_on">Auto HDR brightness is enabled</string>
-            <string name="revanced_hdr_auto_brightness_summary_off">Auto HDR brightness is disabled</string>
-        </patch>
     </app>
     <app id="twitch">
         <patch id="ad.audio.AudioAdsPatch">