chore(release): 4.1.0-dev.2 [skip ci]

# [4.1.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.1.0-dev.1...v4.1.0-dev.2) (2024-02-04)

### Features

* **YouTube:** Support version `19.04.37` ([#2687](https://github.com/ReVanced/revanced-patches/issues/2687)) ([8b1cdd5](8b1cdd5c6a))

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -71,7 +71,7 @@ body:
         Before creating a new feature request, please keep the following in mind:
 
         - **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/ReVanced/revanced-patches/labels/Feature%20request).
-        - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
+        - **Review the contribution guidelines**: Make sure your feature request adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md).
         - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
   - type: textarea
     attributes:

CHANGELOG.md

@@ -1,3 +1,53 @@
+# [4.1.0-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.1.0-dev.1...v4.1.0-dev.2) (2024-02-04)
+
+
+### Features
+
+* **YouTube:** Support version `19.04.37` ([#2687](https://github.com/ReVanced/revanced-patches/issues/2687)) ([c23e023](https://github.com/ReVanced/revanced-patches/commit/c23e0233cf5c28d354132443d227b42ddc4a3dad))
+
+# [4.1.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.0.3-dev.2...v4.1.0-dev.1) (2024-02-02)
+
+
+### Features
+
+* **YouTube - Custom filter:** Custom filtering of the protocol buffer ([#2682](https://github.com/ReVanced/revanced-patches/issues/2682)) ([872a5b6](https://github.com/ReVanced/revanced-patches/commit/872a5b6d8969ab1569cd57ece3c400c3741049be))
+
+## [4.0.3-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.0.3-dev.1...v4.0.3-dev.2) (2024-02-01)
+
+
+### Bug Fixes
+
+* **Infinity for Reddit - Unlock subscription:** Restore functionality on v7.0.0 ([bf19af9](https://github.com/ReVanced/revanced-patches/commit/bf19af99cb522f9027a4b3ae42d6258ac71758e5))
+
+## [4.0.3-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.0.2...v4.0.3-dev.1) (2024-01-28)
+
+
+### Bug Fixes
+
+* **YouTube:** Correctly show channel page on tablet devices ([#2656](https://github.com/ReVanced/revanced-patches/issues/2656)) ([c7c9700](https://github.com/ReVanced/revanced-patches/commit/c7c9700d93caeae105916d33376670f525276fac))
+
+## [4.0.2](https://github.com/ReVanced/revanced-patches/compare/v4.0.1...v4.0.2) (2024-01-28)
+
+
+### Bug Fixes
+
+* **Twitch:** Correct patch resources to fix build ([1b63898](https://github.com/ReVanced/revanced-patches/commit/1b63898413b24693b0b737df29adcf9142963dfa))
+* **YouTube:** Do not crash on startup for root installs ([#2655](https://github.com/ReVanced/revanced-patches/issues/2655)) ([02abace](https://github.com/ReVanced/revanced-patches/commit/02abace127c9ef906c06ded9135cbba2871bd1e6))
+
+## [4.0.2-dev.2](https://github.com/ReVanced/revanced-patches/compare/v4.0.2-dev.1...v4.0.2-dev.2) (2024-01-28)
+
+
+### Bug Fixes
+
+* **YouTube:** Do not crash on startup for root installs ([#2655](https://github.com/ReVanced/revanced-patches/issues/2655)) ([02abace](https://github.com/ReVanced/revanced-patches/commit/02abace127c9ef906c06ded9135cbba2871bd1e6))
+
+## [4.0.2-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.0.1...v4.0.2-dev.1) (2024-01-27)
+
+
+### Bug Fixes
+
+* **Twitch:** Correct patch resources to fix build ([1b63898](https://github.com/ReVanced/revanced-patches/commit/1b63898413b24693b0b737df29adcf9142963dfa))
+
 ## [4.0.1](https://github.com/ReVanced/revanced-patches/compare/v4.0.0...v4.0.1) (2024-01-27)
 
 

api/revanced-patches.api

@@ -1420,6 +1420,10 @@ public final class app/revanced/patches/youtube/layout/startupshortsreset/Disabl
 	public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
 }
 
+public final class app/revanced/patches/youtube/layout/startupshortsreset/fingerprints/UserWasInShortsFingerprint : app/revanced/patcher/fingerprint/MethodFingerprint {
+	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/startupshortsreset/fingerprints/UserWasInShortsFingerprint;
+}
+
 public final class app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch : app/revanced/patcher/patch/BytecodePatch {
 	public static final field INSTANCE Lapp/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch;
 	public fun execute (Lapp/revanced/patcher/data/BytecodeContext;)V

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.0.1
+version = 4.1.0-dev.2

src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/subscription/UnlockSubscriptionPatch.kt

@@ -6,6 +6,7 @@ import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.reddit.customclients.infinityforreddit.api.SpoofClientPatch
 import app.revanced.patches.reddit.customclients.infinityforreddit.subscription.fingerprints.StartSubscriptionActivityFingerprint
+import app.revanced.patches.reddit.customclients.infinityforreddit.subscription.fingerprints.SubscriptionActivityOnCreateFingerprint
 import app.revanced.util.returnEarly
 
 @Patch(
@@ -18,7 +19,8 @@ import app.revanced.util.returnEarly
 )
 @Suppress("unused")
 object UnlockSubscriptionPatch : BytecodePatch(
-    setOf(StartSubscriptionActivityFingerprint)
+    setOf(StartSubscriptionActivityFingerprint, SubscriptionActivityOnCreateFingerprint)
 ) {
-    override fun execute(context: BytecodeContext) = listOf(StartSubscriptionActivityFingerprint).returnEarly()
+    override fun execute(context: BytecodeContext) =
+        listOf(StartSubscriptionActivityFingerprint, SubscriptionActivityOnCreateFingerprint).returnEarly()
 }

src/main/kotlin/app/revanced/patches/reddit/customclients/infinityforreddit/subscription/fingerprints/SubscriptionActivityOnCreateFingerprint.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.reddit.customclients.infinityforreddit.subscription.fingerprints
+
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+internal object SubscriptionActivityOnCreateFingerprint : MethodFingerprint(
+    returnType = "V",
+    accessFlags = AccessFlags.PUBLIC.value,
+    parameters = listOf("Landroid/os/Bundle;"),
+    customFingerprint = { method, classDef ->
+        method.name == "onCreate" && classDef.type.endsWith("SubscriptionActivity;")
+    }
+)

src/main/kotlin/app/revanced/patches/twitch/ad/embedded/EmbeddedAdsPatch.kt

@@ -32,7 +32,7 @@ object EmbeddedAdsPatch : BytecodePatch(
         AddResourcesPatch(this::class)
 
         SettingsPatch.PreferenceScreen.ADS.SURESTREAM.addPreferences(
-            ListPreference("revanced_block_embedded_ads")
+            ListPreference("revanced_block_embedded_ads", summaryKey = null)
         )
 
         val result = CreateUsherClientFingerprint.result ?: throw CreateUsherClientFingerprint.exception

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

@@ -35,7 +35,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt

@@ -30,7 +30,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt

@@ -35,7 +35,9 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt

@@ -22,7 +22,9 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt

@@ -32,7 +32,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsBytecodePatch.kt

@@ -22,7 +22,9 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         ),
     ]

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt

@@ -32,7 +32,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt

@@ -34,7 +34,9 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt

@@ -30,7 +30,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ],

src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt

@@ -36,7 +36,9 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt

@@ -34,7 +34,9 @@ import app.revanced.util.exception
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ],

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt

@@ -33,7 +33,9 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt

@@ -43,7 +43,9 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt

@@ -34,7 +34,9 @@ import com.android.tools.smali.dexlib2.Opcode
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt

@@ -40,7 +40,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt

@@ -38,7 +38,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction3rc
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt

@@ -32,7 +32,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

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

@@ -32,7 +32,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt

@@ -32,7 +32,9 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt

@@ -32,7 +32,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt

@@ -35,7 +35,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt

@@ -32,7 +32,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt

@@ -28,7 +28,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt

@@ -28,7 +28,9 @@ import app.revanced.util.exception
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt

@@ -46,7 +46,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]
@@ -59,6 +61,9 @@ object HideLayoutComponentsPatch : BytecodePatch(
         "Lapp/revanced/integrations/youtube/patches/components/LayoutComponentsFilter;"
     private const val DESCRIPTION_COMPONENTS_FILTER_CLASS_NAME =
         "Lapp/revanced/integrations/youtube/patches/components/DescriptionComponentsFilter;"
+    private const val CUSTOM_FILTER_CLASS_NAME =
+        "Lapp/revanced/integrations/youtube/patches/components/CustomFilter;"
+
 
     override fun execute(context: BytecodeContext) {
         AddResourcesPatch(this::class)
@@ -116,6 +121,7 @@ object HideLayoutComponentsPatch : BytecodePatch(
 
         LithoFilterPatch.addFilter(LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR)
         LithoFilterPatch.addFilter(DESCRIPTION_COMPONENTS_FILTER_CLASS_NAME)
+        LithoFilterPatch.addFilter(CUSTOM_FILTER_CLASS_NAME)
 
         // region Mix playlists
 

src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt

@@ -39,7 +39,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

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

@@ -28,7 +28,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt

@@ -33,7 +33,9 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt

@@ -30,7 +30,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt

@@ -37,7 +37,9 @@ import app.revanced.patches.youtube.shared.fingerprints.SeekbarOnDrawFingerprint
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt

@@ -40,7 +40,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt

@@ -27,7 +27,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt

@@ -28,7 +28,9 @@ import app.revanced.util.exception
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt

@@ -29,7 +29,9 @@ import app.revanced.util.exception
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt

@@ -23,7 +23,9 @@ import org.w3c.dom.Element
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ],

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

@@ -57,7 +57,9 @@ import com.android.tools.smali.dexlib2.iface.reference.TypeReference
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt

@@ -2,6 +2,7 @@ package app.revanced.patches.youtube.layout.searchbar
 
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
@@ -14,6 +15,7 @@ import app.revanced.patches.youtube.layout.searchbar.fingerprints.SetWordmarkHea
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.util.exception
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch(
     name = "Wide searchbar",
@@ -31,7 +33,9 @@ import app.revanced.util.exception
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]
@@ -43,6 +47,10 @@ object WideSearchbarPatch : BytecodePatch(
         CreateSearchSuggestionsFingerprint
     )
 ) {
+
+    private const val INTEGRATIONS_CLASS_DESCRIPTOR =
+        "Lapp/revanced/integrations/youtube/patches/WideSearchbarPatch;"
+
     override fun execute(context: BytecodeContext) {
         AddResourcesPatch(this::class)
 
@@ -76,12 +84,15 @@ object WideSearchbarPatch : BytecodePatch(
      * Injects instructions required for certain methods.
      */
     private fun MutableMethod.injectSearchBarHook() {
+        val insertIndex = implementation!!.instructions.size - 1
+        val insertRegister = getInstruction<OneRegisterInstruction>(insertIndex).registerA
+
         addInstructions(
-            implementation!!.instructions.size - 1,
+            insertIndex,
+            """
+                invoke-static {v$insertRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->enableWideSearchbar(Z)Z
+                move-result v$insertRegister
             """
-                    invoke-static {}, Lapp/revanced/integrations/youtube/patches/WideSearchbarPatch;->enableWideSearchbar()Z
-                    move-result p0
-                """
         )
     }
 }

src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/RestoreOldSeekbarThumbnailsPatch.kt

@@ -28,7 +28,9 @@ import app.revanced.util.exception
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockBytecodePatch.kt

@@ -42,7 +42,9 @@ import com.android.tools.smali.dexlib2.iface.reference.StringReference
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ],

src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt

@@ -32,7 +32,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt

@@ -2,7 +2,10 @@ package app.revanced.patches.youtube.layout.startupshortsreset
 
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 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
@@ -11,6 +14,12 @@ import app.revanced.patches.youtube.layout.startupshortsreset.fingerprints.UserW
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
 import app.revanced.util.exception
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstruction
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 
 @Patch(
     name = "Disable resuming Shorts on startup",
@@ -29,7 +38,9 @@ import app.revanced.util.exception
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]
@@ -49,19 +60,30 @@ object DisableResumingShortsOnStartupPatch : BytecodePatch(
             SwitchPreference("revanced_disable_resuming_shorts_player")
         )
 
-        UserWasInShortsFingerprint.result?.apply {
+        UserWasInShortsFingerprint.result?.mutableMethod?.apply {
-            val moveResultIndex = scanResult.patternScanResult!!.endIndex
+            val listenableInstructionIndex = indexOfFirstInstruction {
+                opcode == Opcode.INVOKE_INTERFACE &&
+                        getReference<MethodReference>()?.definingClass == "Lcom/google/common/util/concurrent/ListenableFuture;" &&
+                        getReference<MethodReference>()?.name == "isDone"
+            }
+            if (listenableInstructionIndex < 0) throw PatchException("Could not find instruction index")
+            val originalInstructionRegister = getInstruction<FiveRegisterInstruction>(listenableInstructionIndex).registerC
+            val freeRegister = getInstruction<OneRegisterInstruction>(listenableInstructionIndex + 1).registerA
 
-            mutableMethod.addInstructionsWithLabels(
+            // Replace original instruction to preserve control flow label.
-                moveResultIndex + 1,
+            replaceInstruction(
+                listenableInstructionIndex,
+                "invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->disableResumingStartupShortsPlayer()Z"
+            )
+            addInstructionsWithLabels(
+                listenableInstructionIndex + 1,
+                """
+                    move-result v$freeRegister
+                    if-eqz v$freeRegister, :show_startup_shorts_player
+                    return-void
+                    :show_startup_shorts_player
+                    invoke-interface {v$originalInstructionRegister}, Lcom/google/common/util/concurrent/ListenableFuture;->isDone()Z
                 """
-                invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->disableResumingStartupShortsPlayer()Z
-                move-result v5
-                if-eqz v5, :disable_shorts_player
-                return-void
-                :disable_shorts_player
-                nop
-            """
             )
         } ?: throw UserWasInShortsFingerprint.exception
     }

src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/fingerprints/UserWasInShortsFingerprint.kt

@@ -1,24 +1,12 @@
 package app.revanced.patches.youtube.layout.startupshortsreset.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
 
-
+object UserWasInShortsFingerprint : MethodFingerprint(
-@FuzzyPatternScanMethod(3)
+    returnType = "V",
-internal object UserWasInShortsFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"),
+    parameters = listOf("Ljava/lang/Object;"),
-    opcodes = listOf(
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-    ),
     strings = listOf("Failed to read user_was_in_shorts proto after successful warmup"),
 )

src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/TabletMiniPlayerPatch.kt

@@ -37,7 +37,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             )
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeBytecodePatch.kt

@@ -41,7 +41,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt

@@ -51,7 +51,9 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt

@@ -33,7 +33,9 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt

@@ -28,7 +28,9 @@ import app.revanced.util.exception
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

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

@@ -21,7 +21,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt

@@ -38,7 +38,9 @@ object GmsCoreSupportPatch : BaseGmsCoreSupportPatch(
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             )
         )
     ),

src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt

@@ -30,7 +30,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt

@@ -34,7 +34,9 @@ import com.android.tools.smali.dexlib2.iface.reference.StringReference
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt

@@ -39,7 +39,9 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt

@@ -35,7 +35,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt

@@ -25,7 +25,6 @@ import java.io.Closeable
 @Patch(
     description = "Adds settings for ReVanced to YouTube.",
     dependencies = [
-        ChangePackageNamePatch::class,
         IntegrationsPatch::class,
         SettingsResourcePatch::class,
         AddResourcesPatch::class
@@ -101,7 +100,7 @@ object SettingsPatch : BytecodePatch(
         targetClass = "com.google.android.libraries.social.licenses.LicenseActivity"
     ) {
         // The package name change has to be reflected in the intent.
-        ChangePackageNamePatch.setOrGetFallbackPackageName("com.google.android.apps.youtube")
+        ChangePackageNamePatch.setOrGetFallbackPackageName("com.google.android.youtube")
     }
 
     object PreferenceScreen : BasePreferenceScreen() {

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

@@ -31,7 +31,9 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt

@@ -39,7 +39,9 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt

@@ -18,7 +18,9 @@ import app.revanced.patches.youtube.video.speed.remember.RememberPlaybackSpeedPa
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuPatch.kt

@@ -35,7 +35,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.49.37",
                 "19.01.34",
                 "19.02.39",
-                "19.03.35"
+                "19.03.35",
+                "19.03.36",
+                "19.04.37"
             ]
         )
     ]

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

@@ -74,25 +74,28 @@
         </patch>
     </app>
     <app id="twitch">
-        <patch id="chat.autoclaim.AutoClaimChannelPointsPatch">
+        <patch id="chat.antidelete.ShowDeletedMessagesPatch">
-            <string-array name="revanced_deleted_messages_entries">
+            <string-array name="revanced_show_deleted_messages_entries">
-                <item>@string/revanced_deleted_messages_entry_1</item>
+                <item>@string/revanced_show_deleted_messages_entry_1</item>
-                <item>@string/revanced_deleted_messages_entry_2</item>
+                <item>@string/revanced_show_deleted_messages_entry_2</item>
-                <item>@string/revanced_deleted_messages_entry_3</item>
+                <item>@string/revanced_show_deleted_messages_entry_3</item>
             </string-array>
-            <string-array name="revanced_deleted_messages_entry_values">
+            <string-array name="revanced_show_deleted_messages_entry_values">
                 <item>hide</item>
                 <item>spoiler</item>
                 <item>cross-out</item>
             </string-array>
+        </patch>
+        <patch id="chat.autoclaim.AutoClaimChannelPointsPatch">
+
         </patch>
         <patch id="ad.embedded.EmbeddedAdsPatch">
-            <string-array name="revanced_hls_proxies_entries">
+            <string-array name="revanced_block_embedded_ads_entries">
-                <item>@string/revanced_hls_proxies_entry_1</item>
+                <item>@string/revanced_block_embedded_ads_entry_1</item>
-                <item>@string/revanced_hls_proxies_entry_2</item>
+                <item>@string/revanced_block_embedded_ads_entry_2</item>
-                <item>@string/revanced_hls_proxies_entry_3</item>
+                <item>@string/revanced_block_embedded_ads_entry_3</item>
             </string-array>
-            <string-array name="revanced_hls_proxies_entry_values">
+            <string-array name="revanced_block_embedded_ads_entry_values">
                 <item>disabled</item>
                 <item>luminous</item>
                 <item>purpleadblock</item>

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

@@ -178,6 +178,9 @@
             <string name="revanced_custom_filter_strings_title">Custom filter</string>
             <string name="revanced_custom_filter_strings_summary">List of component path builder strings to filter separated by new line</string>
             <string name="revanced_custom_filter_preference_screen_summary">Hide components using custom filters</string>
+            <string name="revanced_custom_filter_toast_invalid_characters">Invalid custom filter (must be ASCII only): %s</string>
+            <string name="revanced_custom_filter_toast_invalid_syntax">Invalid custom filter: %s</string>
+            <string name="revanced_custom_filter_toast_reset">Custom filter reset to default</string>
         </patch>
         <patch id="ad.general.HideAdsResourcePatch">
             <string name="revanced_hide_general_ads_title">Hide general ads</string>
@@ -878,7 +881,7 @@
             <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 beforeencountering playback issues</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>
@@ -972,11 +975,9 @@
             <string name="revanced_embedded_ads_service_unavailable">%s is unavailable. Ads may show. Try switching to another ad block service in settings.</string>
             <string name="revanced_embedded_ads_service_failed">%s server returned an error. Ads may show. Try switching to another ad block service in settings.</string>
             <string name="revanced_block_embedded_ads_title">Block embedded video ads</string>
-            <string name="revanced_block_embedded_ads_summary_on">Embedded video ads are blocked</string>
+            <string name="revanced_block_embedded_ads_entry_1">Disabled</string>
-            <string name="revanced_block_embedded_ads_summary_off">Embedded video ads are unblocked</string>
+            <string name="revanced_block_embedded_ads_entry_2">Luminous proxy</string>
-            <string name="revanced_hls_proxies_entry_1">Disabled</string>
+            <string name="revanced_block_embedded_ads_entry_3">PurpleAdBlock proxy</string>
-            <string name="revanced_hls_proxies_entry_2">Luminous proxy</string>
-            <string name="revanced_hls_proxies_entry_3">PurpleAdBlock proxy</string>
         </patch>
         <patch id="ad.video.VideoAdsPatch">
             <string name="revanced_block_video_ads_title">Block video ads</string>
@@ -986,9 +987,9 @@
         <patch id="chat.antidelete.ShowDeletedMessagesPatch">
             <string name="revanced_deleted_msg">message deleted</string>
             <string name="revanced_show_deleted_messages_title">Show deleted messages</string>
-            <string name="revanced_deleted_messages_entry_1">Do not show deleted messages</string>
+            <string name="revanced_show_deleted_messages_entry_1">Do not show deleted messages</string>
-            <string name="revanced_deleted_messages_entry_2">Hide deleted messages behind a spoiler</string>
+            <string name="revanced_show_deleted_messages_entry_2">Hide deleted messages behind a spoiler</string>
-            <string name="revanced_deleted_messages_entry_3">Show deleted messages as crossed-out text</string>
+            <string name="revanced_show_deleted_messages_entry_3">Show deleted messages as crossed-out text</string>
         </patch>
         <patch id="chat.autoclaim.AutoClaimChannelPointsPatch">
             <string name="revanced_auto_claim_channel_points_title">Automatically claim Channel Points</string>
@@ -1000,7 +1001,7 @@
             <string name="revanced_twitch_debug_mode_summary_on">Twitch debug mode is enabled (not recommended)</string>
             <string name="revanced_twitch_debug_mode_summary_off">Twitch debug mode is disabled</string>
         </patch>
-        <patch id="settings.SettingsPatch">
+        <patch id="misc.settings.SettingsPatch">
             <string name="revanced_settings">ReVanced Settings</string>
             <string name="revanced_debug_title">Debug logging</string>
             <string name="revanced_debug_summary_on">Debug logs are enabled</string>