diff --git a/README-template.md b/README-template.md index 5bbba124a..f6e90b27b 100644 --- a/README-template.md +++ b/README-template.md @@ -34,7 +34,10 @@ Example: "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] } ], diff --git a/src/main/kotlin/app/revanced/patches/shared/patch/integrations/AbstractIntegrationsPatch.kt b/src/main/kotlin/app/revanced/patches/shared/patch/integrations/AbstractIntegrationsPatch.kt index 5f01601ca..a5adc6795 100644 --- a/src/main/kotlin/app/revanced/patches/shared/patch/integrations/AbstractIntegrationsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/shared/patch/integrations/AbstractIntegrationsPatch.kt @@ -1,5 +1,6 @@ package app.revanced.patches.shared.patch.integrations +import app.revanced.extensions.exception import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.fingerprint.MethodFingerprint @@ -45,7 +46,7 @@ abstract class AbstractIntegrationsPatch( "sput-object v$contextRegister, " + "$integrationsDescriptor->context:Landroid/content/Context;" ) - } ?: throw PatchException("Could not find hook target fingerprint.") + } ?: throw exception } interface RegisterResolver : (Method) -> Int { diff --git a/src/main/kotlin/app/revanced/patches/shared/patch/litho/ComponentParserPatch.kt b/src/main/kotlin/app/revanced/patches/shared/patch/litho/ComponentParserPatch.kt index 457caf11a..ce89f4baf 100644 --- a/src/main/kotlin/app/revanced/patches/shared/patch/litho/ComponentParserPatch.kt +++ b/src/main/kotlin/app/revanced/patches/shared/patch/litho/ComponentParserPatch.kt @@ -22,8 +22,8 @@ object ComponentParserPatch : BytecodePatch( IdentifierFingerprint ) ) { - internal lateinit var emptyComponentLabel: String - private lateinit var insertMethod: MutableMethod + private lateinit var emptyComponentLabel: String + internal lateinit var insertMethod: MutableMethod private var emptyComponentIndex by Delegates.notNull() private var insertIndex by Delegates.notNull() diff --git a/src/main/kotlin/app/revanced/patches/shared/patch/tracking/AbstractSanitizeUrlQueryPatch.kt b/src/main/kotlin/app/revanced/patches/shared/patch/tracking/AbstractSanitizeUrlQueryPatch.kt index 8fe5ebdde..be05b4d6f 100644 --- a/src/main/kotlin/app/revanced/patches/shared/patch/tracking/AbstractSanitizeUrlQueryPatch.kt +++ b/src/main/kotlin/app/revanced/patches/shared/patch/tracking/AbstractSanitizeUrlQueryPatch.kt @@ -33,6 +33,7 @@ abstract class AbstractSanitizeUrlQueryPatch( } } ?: throw exception } + override fun execute(context: BytecodeContext) { for (fingerprint in sharedFingerprints) fingerprint.invoke() diff --git a/src/main/kotlin/app/revanced/patches/youtube/ads/general/GeneralAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ads/general/GeneralAdsPatch.kt index 8c7df08f5..073fa868e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/ads/general/GeneralAdsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/ads/general/GeneralAdsPatch.kt @@ -43,7 +43,10 @@ import org.w3c.dom.Element "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/ads/video/VideoAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ads/video/VideoAdsPatch.kt index c60dc838e..cfb0987e4 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/ads/video/VideoAdsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/ads/video/VideoAdsPatch.kt @@ -28,7 +28,10 @@ import app.revanced.util.integrations.Constants.ADS_PATH "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/alternativethumbnails/general/AlternativeThumbnailsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/alternativethumbnails/general/AlternativeThumbnailsPatch.kt index 1aa0f2d57..ce6b05fc7 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/alternativethumbnails/general/AlternativeThumbnailsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/alternativethumbnails/general/AlternativeThumbnailsPatch.kt @@ -37,7 +37,10 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/buttoncontainer/ButtonContainerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/buttoncontainer/ButtonContainerPatch.kt index 2a9970b4a..9088073e5 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/buttoncontainer/ButtonContainerPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/buttoncontainer/ButtonContainerPatch.kt @@ -32,7 +32,10 @@ import app.revanced.util.integrations.Constants.COMPONENTS_PATH "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/CommentComponentPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/CommentComponentPatch.kt index 056c37513..0ab0cc4fe 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/CommentComponentPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/buttomplayer/comment/CommentComponentPatch.kt @@ -32,7 +32,10 @@ import app.revanced.util.integrations.Constants.COMPONENTS_PATH "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/FeedFlyoutPanelPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/FeedFlyoutPanelPatch.kt index 0d074aea8..b896450a5 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/FeedFlyoutPanelPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/feed/FeedFlyoutPanelPatch.kt @@ -43,7 +43,10 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/OldQualityLayoutPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/OldQualityLayoutPatch.kt index 1bda5ce6e..f5f85042e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/OldQualityLayoutPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/oldqualitylayout/OldQualityLayoutPatch.kt @@ -43,7 +43,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/PlayerFlyoutPanelPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/PlayerFlyoutPanelPatch.kt index e927f4e23..7223b95e8 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/PlayerFlyoutPanelPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/flyoutpanel/player/PlayerFlyoutPanelPatch.kt @@ -47,7 +47,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/HideAutoplayPreviewPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/HideAutoplayPreviewPatch.kt index 137e789ee..5933ea148 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/HideAutoplayPreviewPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/autoplaypreview/HideAutoplayPreviewPatch.kt @@ -42,7 +42,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/CompactControlsOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/CompactControlsOverlayPatch.kt index 7e57c847b..80710be4e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/CompactControlsOverlayPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/compactcontrolsoverlay/CompactControlsOverlayPatch.kt @@ -38,7 +38,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/endscreenoverlay/HideEndScreenOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/endscreenoverlay/HideEndScreenOverlayPatch.kt index 78554d115..9a8ad73a3 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/endscreenoverlay/HideEndScreenOverlayPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/endscreenoverlay/HideEndScreenOverlayPatch.kt @@ -37,7 +37,10 @@ import app.revanced.util.integrations.Constants.FULLSCREEN "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/HideFullscreenPanelsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/HideFullscreenPanelsPatch.kt index 5b4712586..669aad20b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/HideFullscreenPanelsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/fullscreenpanels/HideFullscreenPanelsPatch.kt @@ -49,7 +49,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/LandScapeModePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/LandScapeModePatch.kt index 49d7a5316..a9a82ed35 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/LandScapeModePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/landscapemode/LandScapeModePatch.kt @@ -36,7 +36,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ], diff --git a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/QuickActionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/QuickActionsPatch.kt index a50c4cd16..272d013b9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/QuickActionsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/fullscreen/quickactions/QuickActionsPatch.kt @@ -34,7 +34,10 @@ import app.revanced.util.integrations.Constants.COMPONENTS_PATH "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/AccountMenuPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/AccountMenuPatch.kt index 8fd4d06f7..f8c6ad177 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/AccountMenuPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/AccountMenuPatch.kt @@ -44,7 +44,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/AutoCaptionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/AutoCaptionsPatch.kt index d4ae282f4..d11ad1519 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/AutoCaptionsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/autocaptions/AutoCaptionsPatch.kt @@ -43,7 +43,10 @@ import app.revanced.util.integrations.Constants.GENERAL "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/autopopuppanels/PlayerPopupPanelsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/autopopuppanels/PlayerPopupPanelsPatch.kt index ccd4aff4f..2d8b51961 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/autopopuppanels/PlayerPopupPanelsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/autopopuppanels/PlayerPopupPanelsPatch.kt @@ -33,7 +33,10 @@ import app.revanced.util.integrations.Constants.GENERAL "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/categorybar/CategoryBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/categorybar/CategoryBarPatch.kt index f46fdf1e9..31a31c647 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/categorybar/CategoryBarPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/categorybar/CategoryBarPatch.kt @@ -41,7 +41,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/channellistsubmenu/ChannelListSubMenuPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/channellistsubmenu/ChannelListSubMenuPatch.kt index 282940484..9e869d480 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/channellistsubmenu/ChannelListSubMenuPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/channellistsubmenu/ChannelListSubMenuPatch.kt @@ -37,7 +37,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/crowdfundingbox/CrowdfundingBoxPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/crowdfundingbox/CrowdfundingBoxPatch.kt index 8f028ef3b..61b6077fe 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/crowdfundingbox/CrowdfundingBoxPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/crowdfundingbox/CrowdfundingBoxPatch.kt @@ -37,7 +37,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/descriptions/DescriptionComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/descriptions/DescriptionComponentsPatch.kt index f0a7c125a..09eb30c92 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/descriptions/DescriptionComponentsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/descriptions/DescriptionComponentsPatch.kt @@ -32,7 +32,10 @@ import app.revanced.util.integrations.Constants.COMPONENTS_PATH "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/floatingmicrophone/FloatingMicrophonePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/floatingmicrophone/FloatingMicrophonePatch.kt index 007f4abfa..3915d8ce7 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/floatingmicrophone/FloatingMicrophonePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/floatingmicrophone/FloatingMicrophonePatch.kt @@ -37,7 +37,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/handle/HideHandlePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/handle/HideHandlePatch.kt index 35993c645..bd3eaeda7 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/handle/HideHandlePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/handle/HideHandlePatch.kt @@ -40,7 +40,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/latestvideosbutton/LatestVideosButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/latestvideosbutton/LatestVideosButtonPatch.kt index f71399e11..9df90cf77 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/latestvideosbutton/LatestVideosButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/latestvideosbutton/LatestVideosButtonPatch.kt @@ -37,7 +37,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/layout/LayoutComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/layout/LayoutComponentsPatch.kt index 96d756418..a3920e936 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/layout/LayoutComponentsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/layout/LayoutComponentsPatch.kt @@ -32,7 +32,10 @@ import app.revanced.util.integrations.Constants.COMPONENTS_PATH "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/loadingscreen/GradientLoadingScreenPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/loadingscreen/GradientLoadingScreenPatch.kt index ef20435f8..6975cc625 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/loadingscreen/GradientLoadingScreenPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/loadingscreen/GradientLoadingScreenPatch.kt @@ -35,7 +35,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/loadmorebutton/LoadMoreButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/loadmorebutton/LoadMoreButtonPatch.kt index 67cc5c6b7..989220336 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/loadmorebutton/LoadMoreButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/loadmorebutton/LoadMoreButtonPatch.kt @@ -38,7 +38,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/mixplaylists/MixPlaylistsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/mixplaylists/MixPlaylistsPatch.kt index 8ebc5c564..f10dcf007 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/mixplaylists/MixPlaylistsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/mixplaylists/MixPlaylistsPatch.kt @@ -46,7 +46,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/MusicSearchPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/MusicSearchPatch.kt index 72318487b..de102d0dc 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/MusicSearchPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/musicsearch/MusicSearchPatch.kt @@ -28,7 +28,10 @@ import app.revanced.util.integrations.Constants.GENERAL "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ], diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/searchterm/SearchTermThumbnailPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/searchterm/SearchTermThumbnailPatch.kt index 6b08e1604..9e5ce10c0 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/searchterm/SearchTermThumbnailPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/searchterm/SearchTermThumbnailPatch.kt @@ -40,7 +40,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] @@ -74,7 +77,8 @@ object SearchTermThumbnailPatch : BytecodePatch( ) + 4 val replaceIndexInstruction = getInstruction(replaceIndex) - val replaceIndexReference = getInstruction(replaceIndex).reference + val replaceIndexReference = + getInstruction(replaceIndex).reference addInstructionsWithLabels( replaceIndex + 1, """ diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/snackbar/HideSnackBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/snackbar/HideSnackBarPatch.kt index 5d1b9df61..fa9b1c670 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/snackbar/HideSnackBarPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/snackbar/HideSnackBarPatch.kt @@ -33,7 +33,10 @@ import app.revanced.util.integrations.Constants.GENERAL "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/SuggestionsShelfPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/SuggestionsShelfPatch.kt index 9ba886331..9d8cad963 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/SuggestionsShelfPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/suggestions/SuggestionsShelfPatch.kt @@ -39,7 +39,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/TabletMiniPlayerPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/TabletMiniPlayerPatch.kt index cf115f638..cd540fd3b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/TabletMiniPlayerPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/TabletMiniPlayerPatch.kt @@ -44,7 +44,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarButtonPatch.kt index 5ae55dce4..4cdbc6471 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/ToolBarButtonPatch.kt @@ -32,7 +32,10 @@ import app.revanced.util.integrations.Constants.GENERAL "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/fingerprints/ToolBarButtonFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/fingerprints/ToolBarButtonFingerprint.kt deleted file mode 100644 index 956548b5c..000000000 --- a/src/main/kotlin/app/revanced/patches/youtube/general/toolbar/fingerprints/ToolBarButtonFingerprint.kt +++ /dev/null @@ -1,23 +0,0 @@ -package app.revanced.patches.youtube.general.toolbar.fingerprints - -import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.MethodFingerprint -import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.MenuItemView -import app.revanced.util.bytecode.isWideLiteralExists -import com.android.tools.smali.dexlib2.AccessFlags -import com.android.tools.smali.dexlib2.Opcode - -object ToolBarButtonFingerprint : MethodFingerprint( - accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, - parameters = listOf("Landroid/view/MenuItem;"), - returnType = "V", - opcodes = listOf( - Opcode.IF_NEZ, - Opcode.SGET_OBJECT, - Opcode.INVOKE_INTERFACE, - Opcode.MOVE_RESULT, - Opcode.IGET_OBJECT, - Opcode.IGET_OBJECT - ), - customFingerprint = { methodDef, _ -> methodDef.isWideLiteralExists(MenuItemView) } -) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/trendingsearches/TrendingSearchesPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/trendingsearches/TrendingSearchesPatch.kt index 70bb82149..72ca7da02 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/trendingsearches/TrendingSearchesPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/trendingsearches/TrendingSearchesPatch.kt @@ -42,7 +42,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/widesearchbar/WideSearchBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/widesearchbar/WideSearchBarPatch.kt index f9e0adcea..d7ee017dd 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/widesearchbar/WideSearchBarPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/widesearchbar/WideSearchBarPatch.kt @@ -42,7 +42,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconMMTPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconMMTPatch.kt index 3ae49fb47..825da9bf2 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconMMTPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconMMTPatch.kt @@ -29,7 +29,10 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ], diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyBluePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyBluePatch.kt index f4831b037..aa7bd2960 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyBluePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyBluePatch.kt @@ -29,7 +29,10 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyRedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyRedPatch.kt index 4349ac839..1eb32728e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyRedPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/CustomBrandingIconRevancifyRedPatch.kt @@ -29,7 +29,10 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ], diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/CustomBrandingNamePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/CustomBrandingNamePatch.kt index 01b65afdd..80340bab0 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/CustomBrandingNamePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/branding/name/CustomBrandingNamePatch.kt @@ -33,7 +33,10 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusLabel "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/DoubleTapOverlayBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/DoubleTapOverlayBackgroundPatch.kt index 48768ae4a..311c8d570 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/DoubleTapOverlayBackgroundPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletapbackground/DoubleTapOverlayBackgroundPatch.kt @@ -27,7 +27,10 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ], diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/DoubleTapLengthPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/DoubleTapLengthPatch.kt index 41499929f..2a0eb599b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/DoubleTapLengthPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/doubletaplength/DoubleTapLengthPatch.kt @@ -32,7 +32,10 @@ import app.revanced.util.resources.ResourceUtils.copyResources "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/header/PremiumHeadingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/header/PremiumHeadingPatch.kt index c02f9de80..ab5939854 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/header/PremiumHeadingPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/header/PremiumHeadingPatch.kt @@ -31,7 +31,10 @@ import kotlin.io.path.copyTo "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ], diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/materialyou/MaterialYouPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/materialyou/MaterialYouPatch.kt index 7a01d728c..764fde2c1 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/materialyou/MaterialYouPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/materialyou/MaterialYouPatch.kt @@ -36,7 +36,10 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ], diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/PiPNotificationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/PiPNotificationPatch.kt index e06f7c134..a6a9c9921 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/PiPNotificationPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/PiPNotificationPatch.kt @@ -3,21 +3,23 @@ package app.revanced.patches.youtube.layout.pipnotification import app.revanced.extensions.exception import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.extensions.InstructionExtensions.addInstruction -import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.PatchException import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch import app.revanced.patches.youtube.layout.pipnotification.fingerprints.PiPNotificationFingerprint +import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.youtube.utils.settings.SettingsPatch -import app.revanced.util.bytecode.getStringIndex -import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction @Patch( name = "Disable pip notification", description = "Disable pip notification when you first launch pip mode.", - dependencies = [SettingsPatch::class], + dependencies = + [ + SettingsPatch::class, + SharedResourceIdPatch::class + ], compatiblePackages = [ CompatiblePackage( "com.google.android.youtube", @@ -35,7 +37,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] @@ -48,28 +53,23 @@ object PiPNotificationPatch : BytecodePatch( PiPNotificationFingerprint.result?.let { it.mutableMethod.apply { - var insertIndex = -1 - - val startIndex = it.scanResult.patternScanResult!!.startIndex - 6 - val endIndex = getStringIndex("honeycomb.Shell\$HomeActivity") - - for (index in endIndex downTo startIndex) { - if (getInstruction(index).opcode != Opcode.CHECK_CAST) continue - - val targetReference = - getInstruction(index).reference.toString() - - if (targetReference == "Lcom/google/apps/tiktok/account/AccountId;") { - insertIndex = index + 1 - - addInstruction( - insertIndex, - "return-void" - ) + val checkCastCalls = implementation!!.instructions.withIndex() + .filter { instruction -> + (instruction.value as? ReferenceInstruction)?.reference.toString() == "Lcom/google/apps/tiktok/account/AccountId;" } - } - if (insertIndex == -1) + + if (checkCastCalls.size != 3) throw PatchException("Couldn't find target Index") + + arrayOf( + checkCastCalls.elementAt(1).index, + checkCastCalls.elementAt(0).index + ).forEach { index -> + addInstruction( + index + 1, + "return-void" + ) + } } } ?: throw PiPNotificationFingerprint.exception diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/fingerprints/PiPNotificationFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/fingerprints/PiPNotificationFingerprint.kt index 1f9af517e..c27b1aca5 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/fingerprints/PiPNotificationFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/pipnotification/fingerprints/PiPNotificationFingerprint.kt @@ -2,18 +2,13 @@ package app.revanced.patches.youtube.layout.pipnotification.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.MethodFingerprint +import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.EditSettingsAction +import app.revanced.util.bytecode.isWideLiteralExists import com.android.tools.smali.dexlib2.AccessFlags -import com.android.tools.smali.dexlib2.Opcode object PiPNotificationFingerprint : MethodFingerprint( returnType = "V", accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, parameters = listOf("L"), - opcodes = listOf( - Opcode.CHECK_CAST, - Opcode.IGET_OBJECT, - Opcode.IF_EQZ, - Opcode.INVOKE_VIRTUAL - ), - strings = listOf("honeycomb.Shell\$HomeActivity") + customFingerprint = { methodDef, _ -> methodDef.isWideLiteralExists(EditSettingsAction) } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/splashanimation/AddSplashAnimationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/splashanimation/AddSplashAnimationPatch.kt index 6bc584e0b..4b93573a0 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/splashanimation/AddSplashAnimationPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/splashanimation/AddSplashAnimationPatch.kt @@ -29,7 +29,10 @@ import kotlin.io.path.exists "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ], diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt index 12bb02b6d..10ee6f47b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt @@ -35,7 +35,10 @@ import org.w3c.dom.Element "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/tooltip/TooltipContentViewPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/tooltip/TooltipContentViewPatch.kt index 91e1d4ad4..9f1ded6b8 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/tooltip/TooltipContentViewPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tooltip/TooltipContentViewPatch.kt @@ -34,7 +34,10 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/AmbientModeSwitchPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/AmbientModeSwitchPatch.kt index fdec04a9d..32ef6f8cd 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/AmbientModeSwitchPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/AmbientModeSwitchPatch.kt @@ -40,7 +40,10 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/codec/audio/ForceOpusCodecPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/codec/audio/ForceOpusCodecPatch.kt index a34ba4c64..c7d3cc5d4 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/codec/audio/ForceOpusCodecPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/codec/audio/ForceOpusCodecPatch.kt @@ -28,7 +28,10 @@ import app.revanced.util.integrations.Constants.MISC_PATH "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/codec/video/ForceVideoCodecPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/codec/video/ForceVideoCodecPatch.kt index 3c39a2a99..3c34f05c6 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/codec/video/ForceVideoCodecPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/codec/video/ForceVideoCodecPatch.kt @@ -43,7 +43,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/DebuggingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/DebuggingPatch.kt index 7ff52a8b7..44c4757ec 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/DebuggingPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/DebuggingPatch.kt @@ -27,7 +27,10 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ], diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/externalbrowser/ExternalBrowserPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/externalbrowser/ExternalBrowserPatch.kt index e54df448c..705cd0edf 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/externalbrowser/ExternalBrowserPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/externalbrowser/ExternalBrowserPatch.kt @@ -36,7 +36,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/language/LanguageSelectorPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/language/LanguageSelectorPatch.kt index be449f0ca..2ab83a69e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/language/LanguageSelectorPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/language/LanguageSelectorPatch.kt @@ -34,7 +34,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/layoutswitch/LayoutSwitchPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/layoutswitch/LayoutSwitchPatch.kt index 3f6416137..b8feafa22 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/layoutswitch/LayoutSwitchPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/layoutswitch/LayoutSwitchPatch.kt @@ -39,7 +39,10 @@ import com.android.tools.smali.dexlib2.Opcode "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt index ada4c2387..2b6298129 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt @@ -44,7 +44,10 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/OpenLinksDirectlyPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/OpenLinksDirectlyPatch.kt index 12621cd4c..0ca2f46ea 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/OpenLinksDirectlyPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/OpenLinksDirectlyPatch.kt @@ -36,7 +36,10 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/quic/QUICProtocolPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/quic/QUICProtocolPatch.kt index a7ca3e669..923eb857a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/quic/QUICProtocolPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/quic/QUICProtocolPatch.kt @@ -32,7 +32,10 @@ import app.revanced.util.integrations.Constants.MISC_PATH "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/splashanimation/NewSplashAnimationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/splashanimation/NewSplashAnimationPatch.kt index 99db4753d..22f9128cf 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/splashanimation/NewSplashAnimationPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/splashanimation/NewSplashAnimationPatch.kt @@ -44,7 +44,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/spoofappversion/SpoofAppVersionPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/spoofappversion/SpoofAppVersionPatch.kt index 4537f4575..f2fd3fab9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/spoofappversion/SpoofAppVersionPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/spoofappversion/SpoofAppVersionPatch.kt @@ -32,7 +32,10 @@ import org.w3c.dom.Element "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] @@ -61,7 +64,7 @@ object SpoofAppVersionPatch : AbstractVersionSpoofPatch( contexts.appendChild( arrayOf( "revanced_spoof_app_version_target_entry" to "@string/revanced_spoof_app_version_target_entry_18_40_34", - "revanced_spoof_app_version_target_entry_value" to "18.40.34", + "revanced_spoof_app_version_target_entry_value" to "18.40.34" ) ) } diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/spoofdimensions/SpoofDeviceDimensionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/spoofdimensions/SpoofDeviceDimensionsPatch.kt index d5ad7c034..e715825a6 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/spoofdimensions/SpoofDeviceDimensionsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/spoofdimensions/SpoofDeviceDimensionsPatch.kt @@ -33,7 +33,10 @@ import com.android.tools.smali.dexlib2.util.MethodUtil "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/tracking/SanitizeUrlQueryPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/tracking/SanitizeUrlQueryPatch.kt index 5359c66a5..795a4d74e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/tracking/SanitizeUrlQueryPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/tracking/SanitizeUrlQueryPatch.kt @@ -37,7 +37,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/translations/TranslationsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/translations/TranslationsPatch.kt index edac8afde..8126fa4e1 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/translations/TranslationsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/translations/TranslationsPatch.kt @@ -28,7 +28,10 @@ import app.revanced.util.resources.ResourceHelper.addTranslations "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/navigation/homepage/ChangeHomePagePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/navigation/homepage/ChangeHomePagePatch.kt index 4823a2cec..3770421d1 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/navigation/homepage/ChangeHomePagePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/navigation/homepage/ChangeHomePagePatch.kt @@ -35,7 +35,10 @@ import app.revanced.util.integrations.Constants.NAVIGATION "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/navigation/label/NavigationLabelPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/navigation/label/NavigationLabelPatch.kt index 5feb191e9..451a0b04d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/navigation/label/NavigationLabelPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/navigation/label/NavigationLabelPatch.kt @@ -34,7 +34,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/NavigationButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/NavigationButtonsPatch.kt index a3d349fb7..9ce420a91 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/NavigationButtonsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/navigation/navigationbuttons/NavigationButtonsPatch.kt @@ -46,7 +46,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/navigation/tabletnavbar/TabletNavigationBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/navigation/tabletnavbar/TabletNavigationBarPatch.kt index b01b796fa..9b0008225 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/navigation/tabletnavbar/TabletNavigationBarPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/navigation/tabletnavbar/TabletNavigationBarPatch.kt @@ -35,7 +35,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt index 34e082c54..b60f49949 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt @@ -52,7 +52,10 @@ import org.w3c.dom.Element "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/autoplaybutton/HideAutoplayButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/autoplaybutton/HideAutoplayButtonPatch.kt index 6c883a857..481472978 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/autoplaybutton/HideAutoplayButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/autoplaybutton/HideAutoplayButtonPatch.kt @@ -42,7 +42,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/captionsbutton/HideCaptionsButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/captionsbutton/HideCaptionsButtonPatch.kt index 6275cc19d..bd25d9a99 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/captionsbutton/HideCaptionsButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/captionsbutton/HideCaptionsButtonPatch.kt @@ -38,7 +38,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/castbutton/HideCastButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/castbutton/HideCastButtonPatch.kt index 0f05c5e9f..998d14a0f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/castbutton/HideCastButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/castbutton/HideCastButtonPatch.kt @@ -31,7 +31,10 @@ import app.revanced.util.integrations.Constants.PLAYER "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/HideCollapseButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/HideCollapseButtonPatch.kt index 7bac4ede2..73df9e891 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/HideCollapseButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/collapsebutton/HideCollapseButtonPatch.kt @@ -32,7 +32,10 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/endscreencards/HideEndScreenCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/endscreencards/HideEndScreenCardsPatch.kt index 7cfab8593..886de8bad 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/endscreencards/HideEndScreenCardsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/endscreencards/HideEndScreenCardsPatch.kt @@ -39,7 +39,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/filmstripoverlay/HideFilmstripOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/filmstripoverlay/HideFilmstripOverlayPatch.kt index 295227a54..b8e6e5012 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/filmstripoverlay/HideFilmstripOverlayPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/filmstripoverlay/HideFilmstripOverlayPatch.kt @@ -52,7 +52,10 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/HapticFeedBackPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/HapticFeedBackPatch.kt index b108324a7..64ca03d9b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/HapticFeedBackPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/hapticfeedback/HapticFeedBackPatch.kt @@ -41,7 +41,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/infocards/HideInfoCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/infocards/HideInfoCardsPatch.kt index 0867feb42..78d07b07b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/infocards/HideInfoCardsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/infocards/HideInfoCardsPatch.kt @@ -38,7 +38,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/HideMusicButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/HideMusicButtonPatch.kt index 847f9589f..690a43305 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/HideMusicButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/musicbutton/HideMusicButtonPatch.kt @@ -37,7 +37,10 @@ import app.revanced.util.integrations.Constants.PLAYER "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/HidePlayerButtonBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/HidePlayerButtonBackgroundPatch.kt index 2eb284795..8bf9c61f0 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/HidePlayerButtonBackgroundPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/HidePlayerButtonBackgroundPatch.kt @@ -35,7 +35,10 @@ import app.revanced.util.integrations.Constants.INTEGRATIONS_PATH "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlay/CustomPlayerOverlayOpacityPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlay/CustomPlayerOverlayOpacityPatch.kt index a07538e5e..d970a54da 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlay/CustomPlayerOverlayOpacityPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlay/CustomPlayerOverlayOpacityPatch.kt @@ -41,7 +41,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/HidePreviousNextButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/HidePreviousNextButtonPatch.kt index 48f0d1503..bdd4f6429 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/HidePreviousNextButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/previousnextbutton/HidePreviousNextButtonPatch.kt @@ -31,7 +31,10 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/seekmessage/SeekMessagePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/seekmessage/SeekMessagePatch.kt index 13404d347..0103a696e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/seekmessage/SeekMessagePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/seekmessage/SeekMessagePatch.kt @@ -46,7 +46,10 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/SpeedOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/SpeedOverlayPatch.kt index 842e8e1d5..b8902e79c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/SpeedOverlayPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/SpeedOverlayPatch.kt @@ -34,7 +34,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/suggestactions/SuggestedActionsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/suggestactions/SuggestedActionsPatch.kt index 1e6a70eb7..8cb7e2e3a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/suggestactions/SuggestedActionsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/suggestactions/SuggestedActionsPatch.kt @@ -41,7 +41,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/suggestedvideooverlay/SuggestedVideoOverlayPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/suggestedvideooverlay/SuggestedVideoOverlayPatch.kt index 2c4ec2d7b..4d1baf49e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/suggestedvideooverlay/SuggestedVideoOverlayPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/suggestedvideooverlay/SuggestedVideoOverlayPatch.kt @@ -41,7 +41,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/watermark/HideChannelWatermarkPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/watermark/HideChannelWatermarkPatch.kt index d086fbb4f..de9da18c1 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/watermark/HideChannelWatermarkPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/watermark/HideChannelWatermarkPatch.kt @@ -40,7 +40,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/append/AppendTimeStampInformationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/append/AppendTimeStampInformationPatch.kt index 60756cfba..3cfd8b32d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/append/AppendTimeStampInformationPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/append/AppendTimeStampInformationPatch.kt @@ -45,7 +45,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/color/SeekbarColorPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/color/SeekbarColorPatch.kt index 720548d5d..65f7c5308 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/color/SeekbarColorPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/color/SeekbarColorPatch.kt @@ -50,7 +50,10 @@ import org.w3c.dom.Element "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/hide/HideSeekbarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/hide/HideSeekbarPatch.kt index adef420ab..3edb72b4f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/hide/HideSeekbarPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/hide/HideSeekbarPatch.kt @@ -38,7 +38,10 @@ import app.revanced.util.integrations.Constants.SEEKBAR "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/SeekbarTappingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/SeekbarTappingPatch.kt index 4b1d320af..11c34f3a3 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/SeekbarTappingPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/tapping/SeekbarTappingPatch.kt @@ -39,7 +39,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction11n "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/thumbnailpreview/NewThumbnailPreviewPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/thumbnailpreview/NewThumbnailPreviewPatch.kt index c5e85e60f..637beb276 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/thumbnailpreview/NewThumbnailPreviewPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/thumbnailpreview/NewThumbnailPreviewPatch.kt @@ -33,7 +33,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/HideTimeStampPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/HideTimeStampPatch.kt index 049ff0eab..098049bf3 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/HideTimeStampPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/seekbar/timestamps/HideTimeStampPatch.kt @@ -38,7 +38,10 @@ import app.revanced.util.integrations.Constants.SEEKBAR "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsComponentPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsComponentPatch.kt index 532549eda..0999ebbb3 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsComponentPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsComponentPatch.kt @@ -68,7 +68,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/startupshortsreset/DisableShortsOnStartupPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/startupshortsreset/DisableShortsOnStartupPatch.kt index 0c12d23d8..67a0cd7cd 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/shorts/startupshortsreset/DisableShortsOnStartupPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/startupshortsreset/DisableShortsOnStartupPatch.kt @@ -35,7 +35,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt index e82500651..d79a14ab4 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/swipe/controls/SwipeControlsPatch.kt @@ -49,7 +49,10 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt index ff2e2f120..92b6742ca 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fix/parameter/SpoofPlayerParameterPatch.kt @@ -48,7 +48,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/microg/MicroGPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/microg/MicroGPatch.kt index 657cfcbe1..33db93190 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/microg/MicroGPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/microg/MicroGPatch.kt @@ -40,7 +40,10 @@ import app.revanced.util.resources.ResourceHelper.setMicroG "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/SharedResourceIdPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/SharedResourceIdPatch.kt index bae55a037..04ec6673e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/SharedResourceIdPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/SharedResourceIdPatch.kt @@ -38,6 +38,7 @@ object SharedResourceIdPatch : ResourcePatch() { var DislikeButton: Long = -1 var DonationCompanion: Long = -1 var EasySeekEduContainer: Long = -1 + var EditSettingsAction: Long = -1 var EndScreenElementLayoutCircle: Long = -1 var EndScreenElementLayoutIcon: Long = -1 var EndScreenElementLayoutVideo: Long = -1 @@ -119,6 +120,7 @@ object SharedResourceIdPatch : ResourcePatch() { DislikeButton = find(ID, "dislike_button") DonationCompanion = find(LAYOUT, "donation_companion") EasySeekEduContainer = find(ID, "easy_seek_edu_container") + EditSettingsAction = find(STRING, "edit_settings_action") EndScreenElementLayoutCircle = find(LAYOUT, "endscreen_element_layout_circle") EndScreenElementLayoutIcon = find(LAYOUT, "endscreen_element_layout_icon") EndScreenElementLayoutVideo = find(LAYOUT, "endscreen_element_layout_video") diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/ReturnYouTubeDislikePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/ReturnYouTubeDislikePatch.kt index a57cfaffa..0bdb82786 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/ReturnYouTubeDislikePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/general/ReturnYouTubeDislikePatch.kt @@ -62,7 +62,10 @@ import com.android.tools.smali.dexlib2.iface.reference.Reference "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/rollingnumber/ReturnYouTubeDislikeRollingNumberPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/rollingnumber/ReturnYouTubeDislikeRollingNumberPatch.kt index 2a6d85222..e77eb403d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/rollingnumber/ReturnYouTubeDislikeRollingNumberPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/rollingnumber/ReturnYouTubeDislikeRollingNumberPatch.kt @@ -93,8 +93,8 @@ object ReturnYouTubeDislikeRollingNumberPatch : BytecodePatch( // Video less than 24 hours after uploaded, like counts will be updated in real time. // Whenever like counts are updated, TextView is set in this method. - val realTimeUpdateTextViewMethod = it.mutableClass.methods.find { - method -> method.parameterTypes.first() == "Landroid/graphics/Bitmap;" + val realTimeUpdateTextViewMethod = it.mutableClass.methods.find { method -> + method.parameterTypes.first() == "Landroid/graphics/Bitmap;" } ?: throw PatchException("Failed to find realTimeUpdateTextViewMethod") arrayOf( @@ -102,9 +102,10 @@ object ReturnYouTubeDislikeRollingNumberPatch : BytecodePatch( realTimeUpdateTextViewMethod ).forEach { insertMethod -> insertMethod.apply { - val setTextIndex = implementation!!.instructions.indexOfFirst { instruction -> - ((instruction as? ReferenceInstruction)?.reference as? MethodReference)?.name == "setText" - } + val setTextIndex = + implementation!!.instructions.indexOfFirst { instruction -> + ((instruction as? ReferenceInstruction)?.reference as? MethodReference)?.name == "setText" + } val textViewRegister = getInstruction(setTextIndex).registerC diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt index b3cec0f61..523e35a2f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt @@ -47,7 +47,10 @@ import java.util.concurrent.TimeUnit "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ], diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockBytecodePatch.kt index 655fd3c03..f8e69f6f9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockBytecodePatch.kt @@ -197,18 +197,14 @@ object SponsorBlockBytecodePatch : BytecodePatch( SegmentPlaybackControllerFingerprint.result?.let { result -> result.mutableMethod.apply { - for ((index, instruction) in implementation!!.instructions.withIndex()) { - if (instruction.opcode != Opcode.CONST_STRING) continue + val replaceIndex = result.scanResult.patternScanResult!!.startIndex + val replaceRegister = + getInstruction(replaceIndex).registerA - val register = - getInstruction(index).registerA - - replaceInstruction( - index, - "const-string v$register, \"$rectangleFieldName\"" - ) - break - } + replaceInstruction( + replaceIndex, + "const-string v$replaceRegister, \"$rectangleFieldName\"" + ) } } ?: throw SegmentPlaybackControllerFingerprint.exception } diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt index 065d2fa9f..61554a78c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt @@ -34,7 +34,10 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/fingerprints/SegmentPlaybackControllerFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/fingerprints/SegmentPlaybackControllerFingerprint.kt index e25d66440..345e308b4 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/fingerprints/SegmentPlaybackControllerFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/fingerprints/SegmentPlaybackControllerFingerprint.kt @@ -3,11 +3,13 @@ package app.revanced.patches.youtube.utils.sponsorblock.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 object SegmentPlaybackControllerFingerprint : MethodFingerprint( returnType = "V", accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC, parameters = listOf("Ljava/lang/Object;"), + opcodes = listOf(Opcode.CONST_STRING), customFingerprint = { methodDef, _ -> methodDef.definingClass == "Lapp/revanced/integrations/sponsorblock/SegmentPlaybackController;" && methodDef.name == "setSponsorBarRect" diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/toolbar/ToolBarHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/toolbar/ToolBarHookPatch.kt index e25628f38..005b8b128 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/toolbar/ToolBarHookPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/toolbar/ToolBarHookPatch.kt @@ -4,6 +4,7 @@ import app.revanced.extensions.exception import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.getInstruction +import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.Patch import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod @@ -11,7 +12,7 @@ import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.youtube.utils.toolbar.fingerprints.ToolBarButtonFingerprint import app.revanced.patches.youtube.utils.toolbar.fingerprints.ToolBarPatchFingerprint import app.revanced.util.integrations.Constants.UTILS_PATH -import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction +import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction @@ -26,21 +27,27 @@ object ToolBarHookPatch : BytecodePatch( ToolBarButtonFingerprint.result?.let { it.mutableMethod.apply { - val startIndex = it.scanResult.patternScanResult!!.startIndex - val endIndex = it.scanResult.patternScanResult!!.endIndex + val replaceIndex = it.scanResult.patternScanResult!!.startIndex + val freeIndex = it.scanResult.patternScanResult!!.endIndex - 1 - val insertIndex = endIndex - 1 - val enumRegister = getInstruction(startIndex).registerA - val freeRegister = getInstruction(endIndex).registerA + val replaceReference = getInstruction(replaceIndex).reference + val replaceRegister = + getInstruction(replaceIndex).registerC + val enumRegister = getInstruction(replaceIndex).registerD + val freeRegister = getInstruction(freeIndex).registerA - val imageViewReference = getInstruction(insertIndex).reference + val imageViewIndex = replaceIndex + 2 + val imageViewReference = + getInstruction(imageViewIndex).reference addInstructions( - insertIndex, """ + replaceIndex + 1, """ iget-object v$freeRegister, p0, $imageViewReference invoke-static {v$enumRegister, v$freeRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->hookToolBar(Ljava/lang/Enum;Landroid/widget/ImageView;)V + invoke-interface {v$replaceRegister, v$enumRegister}, $replaceReference """ ) + removeInstruction(replaceIndex) } } ?: throw ToolBarButtonFingerprint.exception diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/toolbar/fingerprints/ToolBarButtonFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/toolbar/fingerprints/ToolBarButtonFingerprint.kt index 8b8c0fb36..3cf6f25fa 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/toolbar/fingerprints/ToolBarButtonFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/toolbar/fingerprints/ToolBarButtonFingerprint.kt @@ -12,12 +12,11 @@ object ToolBarButtonFingerprint : MethodFingerprint( parameters = listOf("Landroid/view/MenuItem;"), returnType = "V", opcodes = listOf( - Opcode.IF_NEZ, - Opcode.SGET_OBJECT, Opcode.INVOKE_INTERFACE, Opcode.MOVE_RESULT, Opcode.IGET_OBJECT, - Opcode.IGET_OBJECT + Opcode.IGET_OBJECT, + Opcode.INVOKE_VIRTUAL ), customFingerprint = { methodDef, _ -> methodDef.isWideLiteralExists(MenuItemView) } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/CustomPlaybackSpeedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/CustomPlaybackSpeedPatch.kt index dc6eec9c0..115b0fa99 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/CustomPlaybackSpeedPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/CustomPlaybackSpeedPatch.kt @@ -32,7 +32,10 @@ import app.revanced.util.integrations.Constants.VIDEO_PATH "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrVideoPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrVideoPatch.kt index 88c162067..55a57dac2 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrVideoPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrVideoPatch.kt @@ -34,7 +34,10 @@ import app.revanced.util.integrations.Constants.VIDEO_PATH "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt index ac7fafdc1..684e2b6c4 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt @@ -49,7 +49,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt index d032f9183..2597f54ea 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt @@ -41,7 +41,10 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39", + "18.42.41", + "18.43.45" ] ) ]