feat(YouTube): Support version 19.03.35 (ReVanced#2640)

mrwedders · Mar 21, 2024 · 1ccb715 · 1ccb715
1 parent 777b168
commit 1ccb715
Show file tree

Hide file tree

Showing 59 changed files with 135 additions and 64 deletions.
diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
@@ -34,7 +34,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt
@@ -29,7 +29,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt
@@ -33,7 +33,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/...kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt b/...kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt
@@ -21,7 +21,8 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/...tlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt b/...tlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt
@@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/...tlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsBytecodePatch.kt b/...tlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsBytecodePatch.kt
@@ -21,7 +21,8 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         ),
     ]

diff --git a/...lin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt b/...lin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt
@@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/...main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt b/...main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt
@@ -33,7 +33,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt
@@ -29,7 +29,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ],

diff --git a/...tlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt b/...tlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt
@@ -35,7 +35,8 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt
@@ -33,7 +33,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ],

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt
@@ -31,7 +31,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/...in/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt b/...in/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt
@@ -41,7 +41,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/...in/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt b/...in/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt
@@ -32,7 +32,8 @@ import com.android.tools.smali.dexlib2.Opcode
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/...n/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt b/...n/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt
@@ -38,7 +38,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/.../kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt b/.../kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt
@@ -36,7 +36,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction3rc
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt
@@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch.kt
@@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt
@@ -30,7 +30,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/...n/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt b/...n/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt
@@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/...kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt b/...kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt
@@ -34,7 +34,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt
@@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/...anced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt b/...anced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt
@@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/...ed/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt b/...ed/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt
@@ -27,7 +27,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/...main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt b/...main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
@@ -41,7 +41,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt
@@ -38,7 +38,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/...kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch.kt b/...kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch.kt
@@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/...lin/app/revanced/patches/youtube/layout/hide/personalinformation/HideEmailAddressPatch.kt b/...lin/app/revanced/patches/youtube/layout/hide/personalinformation/HideEmailAddressPatch.kt
@@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/.../revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt b/.../revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt
@@ -31,7 +31,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/.../revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt b/.../revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt
@@ -29,7 +29,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt
@@ -35,7 +35,8 @@ import app.revanced.patches.youtube.shared.fingerprints.SeekbarOnDrawFingerprint
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]

diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt
@@ -39,7 +39,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]
@@ -59,6 +60,8 @@ object HideShortsComponentsPatch : BytecodePatch(
     override fun execute(context: BytecodeContext) {
         // region Hide the Shorts shelf.
 
+        // This patch point is not present in 19.03.x and greater.
+        // If 19.02.x and lower is dropped, then this section of code and the fingerprint should be removed.
         ReelConstructorFingerprint.result?.let {
             it.mutableMethod.apply {
                 val insertIndex = it.scanResult.patternScanResult!!.startIndex + 2
@@ -71,7 +74,7 @@ object HideShortsComponentsPatch : BytecodePatch(
                     "hideShortsShelf"
                 )
             }
-        } ?: throw ReelConstructorFingerprint.exception
+        } // Do not throw an exception if not resolved.
 
         // endregion
 

diff --git a/...tlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt b/...tlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt
@@ -97,9 +97,15 @@ object HideShortsComponentsResourcePatch : ResourcePatch() {
             )
         )
 
-        fun String.getId() = ResourceMappingPatch.resourceMappings.single { it.name == this }.id
+        ResourceMappingPatch.resourceMappings.find {
+            it.type == "layout" && it.name == "reel_multiple_items_shelf"
+        }?.also {
+            reelMultipleItemShelfId = it.id
+        }
 
-        reelMultipleItemShelfId = "reel_multiple_items_shelf".getId()
-        reelPlayerRightCellButtonHeight = "reel_player_right_cell_button_height".getId()
+        reelPlayerRightCellButtonHeight =
+            ResourceMappingPatch.resourceMappings.single {
+                it.type == "dimen" && it.name == "reel_player_right_cell_button_height"
+            }.id
     }
 }
diff --git a/...pp/revanced/patches/youtube/layout/hide/shorts/fingerprints/ReelConstructorFingerprint.kt b/...pp/revanced/patches/youtube/layout/hide/shorts/fingerprints/ReelConstructorFingerprint.kt
@@ -1,13 +1,19 @@
 package app.revanced.patches.youtube.layout.hide.shorts.fingerprints
 
 import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
 import app.revanced.patches.youtube.layout.hide.shorts.HideShortsComponentsResourcePatch
-import app.revanced.util.patch.LiteralValueFingerprint
+import app.revanced.util.containsWideLiteralInstructionValue
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-internal object ReelConstructorFingerprint : LiteralValueFingerprint(
+internal object ReelConstructorFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
     opcodes = listOf(Opcode.INVOKE_VIRTUAL),
-    literalSupplier = { HideShortsComponentsResourcePatch.reelMultipleItemShelfId }
+    customFingerprint = { methodDef, _ ->
+        // Cannot use LiteralValueFingerprint, because the resource id may not be present.
+        val reelMultipleItemShelfId = HideShortsComponentsResourcePatch.reelMultipleItemShelfId
+        reelMultipleItemShelfId != -1L
+                && methodDef.containsWideLiteralInstructionValue(reelMultipleItemShelfId)
+    }
 )
diff --git a/...atches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt b/...atches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt
@@ -26,7 +26,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
                 "18.48.39",
                 "18.49.37",
                 "19.01.34",
-                "19.02.34"
+                "19.02.39",
+                "19.03.35"
             ]
         )
     ]