diff --git a/README-template.md b/README-template.md index b8620486f..8c18f9bdf 100644 --- a/README-template.md +++ b/README-template.md @@ -35,7 +35,8 @@ Example: "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39" ] } ], 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 f168465b4..2c77fe615 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 @@ -39,8 +39,8 @@ object ComponentParserPatch : BytecodePatch( """ invoke-static {v$stringBuilderRegister, v$identifierRegister, v$objectRegister}, $descriptor(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/Object;)Z move-result v$stringBuilderRegister - if-nez v$stringBuilderRegister, :filter - """, ExternalLabel("filter", getInstruction(emptyComponentIndex)) + if-eqz v$stringBuilderRegister, :filter + """ + emptyComponentLabel, ExternalLabel("filter", getInstruction(insertIndex)) ) } } @@ -52,8 +52,8 @@ object ComponentParserPatch : BytecodePatch( """ invoke-static {v$stringBuilderRegister}, $descriptor(Ljava/lang/StringBuilder;)Z move-result v$stringBuilderRegister - if-nez v$stringBuilderRegister, :filter - """, ExternalLabel("filter", getInstruction(emptyComponentIndex)) + if-eqz v$stringBuilderRegister, :filter + """ + emptyComponentLabel, ExternalLabel("filter", getInstruction(insertIndex)) ) } } 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 66c75bb31..8545cedae 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 @@ -44,7 +44,8 @@ import org.w3c.dom.Element "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39" ] ) ] 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 5ef5d63a0..f87b30f44 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 @@ -29,7 +29,8 @@ 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" ] ) ] 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 7a3484d28..11af8e7b9 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 @@ -38,7 +38,8 @@ 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" ] ) ] 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 0bf78efe2..2a03a38d1 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 @@ -33,7 +33,8 @@ 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" ] ) ] 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 c60b1c111..bbb8644a2 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 @@ -33,7 +33,8 @@ 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" ] ) ] 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 d6522def8..1c0db9539 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 @@ -44,7 +44,8 @@ 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" ] ) ] 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 cfb6c4ba0..a3e2d73ac 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 @@ -44,7 +44,8 @@ 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" ] ) ] 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 322434790..eab2f6c01 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 @@ -48,7 +48,8 @@ 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" ] ) ] 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 8c5452042..632ed6612 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 @@ -43,7 +43,8 @@ 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" ] ) ] 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 aa8319e86..9b1194311 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 @@ -39,7 +39,8 @@ 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" ] ) ] 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 123ca6973..f7dd2bb8f 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 @@ -38,7 +38,8 @@ 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" ] ) ] 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 5f15412b3..193b4b9ae 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 @@ -50,7 +50,8 @@ 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" ] ) ] 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 95576c516..3a51b0297 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 @@ -37,7 +37,8 @@ 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" ] ) ], 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 a8e5645c9..266fcc40f 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 @@ -35,7 +35,8 @@ 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" ] ) ] 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 d05636b6d..b4d28dc18 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 @@ -39,7 +39,8 @@ 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" ] ) ] 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 14970bce1..09d954305 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 @@ -44,7 +44,8 @@ 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" ] ) ] 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 2448cbd88..6c24d4910 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 @@ -34,7 +34,8 @@ 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" ] ) ] 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 411066645..c5763448e 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 @@ -42,7 +42,8 @@ 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" ] ) ] 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 56710227c..7d73f1f85 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 @@ -38,7 +38,8 @@ 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" ] ) ] 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 2ab728ebc..8023792e2 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 @@ -38,7 +38,8 @@ 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" ] ) ] 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 a3274de0f..673e18701 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 @@ -33,7 +33,8 @@ 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" ] ) ] 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 11354242c..81840e54c 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 @@ -38,7 +38,8 @@ 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" ] ) ] 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 e73a2d9f3..c1de4c98d 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 @@ -41,7 +41,8 @@ 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" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/headerswitch/HeaderSwitchPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/headerswitch/HeaderSwitchPatch.kt index 5e984e60f..b372cf6be 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/general/headerswitch/HeaderSwitchPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/general/headerswitch/HeaderSwitchPatch.kt @@ -40,7 +40,8 @@ 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" ] ) ] 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 2bbc64351..96b1f4dfe 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 @@ -38,7 +38,8 @@ 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" ] ) ] 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 b54d842fb..6ed3ed18f 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 @@ -33,7 +33,8 @@ 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" ] ) ] 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 a6dac45af..16141fd2f 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 @@ -36,7 +36,8 @@ 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" ] ) ] 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 15a661895..4b7b70b62 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,8 @@ 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" ] ) ] 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 22e056282..94555b1a0 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 @@ -47,7 +47,8 @@ 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" ] ) ] 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 e381a6098..f4be1e21d 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 @@ -34,7 +34,8 @@ 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" ] ) ] 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 460bcf5a6..d04d9cd02 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 @@ -43,7 +43,8 @@ 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" ] ) ] 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 399456363..24d142767 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 @@ -45,7 +45,8 @@ 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" ] ) ] 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 ab59c2aac..8e511ab01 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 @@ -33,7 +33,8 @@ 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" ] ) ] 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 ad68effa2..9f430b0b3 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 @@ -43,7 +43,8 @@ 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" ] ) ] 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 fa7fa3aac..e79bc4a19 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 @@ -43,7 +43,8 @@ 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" ] ) ] 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 c0d5b0385..4f85abd09 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 @@ -30,7 +30,8 @@ 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" ] ) ], 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 56d4912f4..dd9cc4896 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 @@ -30,7 +30,8 @@ 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" ] ) ] 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 0fdfdac40..bb2b27541 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 @@ -30,7 +30,8 @@ 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" ] ) ], 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 58ae4f9d8..506c6b5c8 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 @@ -34,7 +34,8 @@ 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" ] ) ] 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 abbcda5ee..f31751746 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 @@ -28,7 +28,8 @@ 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" ] ) ], 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 93ed035ca..15b7c3801 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 @@ -33,7 +33,8 @@ 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" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/forcebackground/PlayerButtonBackgroundPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/forcebackground/PlayerButtonBackgroundPatch.kt index 5ffb2a750..ec748326d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/forcebackground/PlayerButtonBackgroundPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/forcebackground/PlayerButtonBackgroundPatch.kt @@ -30,7 +30,8 @@ import org.w3c.dom.Element "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39" ] ) ], diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/forceheader/PremiumHeadingPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/forceheader/PremiumHeadingPatch.kt index 278f99c58..14f50118b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/forceheader/PremiumHeadingPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/forceheader/PremiumHeadingPatch.kt @@ -32,7 +32,8 @@ import kotlin.io.path.exists "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39" ] ) ], 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 e1d931700..19fd2187b 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 @@ -37,7 +37,8 @@ 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" ] ) ], 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 ffa1f0d30..d4c2ec82c 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 @@ -36,7 +36,8 @@ 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" ] ) ] 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 717373869..d9d4743f9 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 @@ -30,7 +30,8 @@ import kotlin.io.path.exists "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39" ] ) ], 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 f2860d157..d102656a7 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 @@ -36,7 +36,8 @@ import org.w3c.dom.Element "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39" ] ) ] 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 e90735c40..6a9552729 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 @@ -35,7 +35,8 @@ 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" ] ) ] 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 b627e47a5..5a912beac 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 @@ -41,7 +41,8 @@ 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" ] ) ] 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 ec31c3392..7d597b9a2 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 @@ -29,7 +29,8 @@ 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" ] ) ] 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 61fc8f4bc..cc44e9b97 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 @@ -44,7 +44,8 @@ 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" ] ) ] 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 a7d0d0473..737ae2df5 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 @@ -28,7 +28,8 @@ 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" ] ) ], 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 983f22071..c62d50d38 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 @@ -37,7 +37,8 @@ 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" ] ) ] 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 25cf4ba18..dbe9ca5d8 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 @@ -35,7 +35,8 @@ 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" ] ) ] 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 5c86a6db4..4209ab678 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 @@ -40,7 +40,8 @@ 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" ] ) ] 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 ff8dcc8cc..10de7d9ae 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 @@ -45,7 +45,8 @@ 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" ] ) ] 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 355eb11cc..500eba6f4 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 @@ -11,7 +11,9 @@ import app.revanced.patches.youtube.misc.openlinksdirectly.fingerprints.OpenLink import app.revanced.patches.youtube.misc.openlinksdirectly.fingerprints.OpenLinksDirectlyFingerprintSecondary import app.revanced.patches.youtube.utils.settings.SettingsPatch import app.revanced.util.integrations.Constants.MISC_PATH +import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c +import com.android.tools.smali.dexlib2.iface.reference.MethodReference @Patch( name = "Enable open links directly", @@ -35,7 +37,8 @@ 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" ] ) ] @@ -55,12 +58,15 @@ object OpenLinksDirectlyPatch : BytecodePatch( ).forEach { fingerprint -> fingerprint.result?.let { it.mutableMethod.apply { - val insertIndex = it.scanResult.patternScanResult!!.startIndex - val register = getInstruction(insertIndex).registerC + val insertIndex = implementation!!.instructions + .indexOfFirst { instruction -> + ((instruction as? ReferenceInstruction)?.reference as? MethodReference)?.name == "parse" + } + val insertRegister = getInstruction(insertIndex).registerC replaceInstruction( insertIndex, - "invoke-static {v$register}, $MISC_PATH/OpenLinksDirectlyPatch;->enableBypassRedirect(Ljava/lang/String;)Landroid/net/Uri;" + "invoke-static {v$insertRegister}, $MISC_PATH/OpenLinksDirectlyPatch;->enableBypassRedirect(Ljava/lang/String;)Landroid/net/Uri;" ) } } ?: throw fingerprint.exception diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/fingerprints/OpenLinksDirectlyFingerprintPrimary.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/fingerprints/OpenLinksDirectlyFingerprintPrimary.kt index 7fd7fadde..766fe44b2 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/fingerprints/OpenLinksDirectlyFingerprintPrimary.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/openlinksdirectly/fingerprints/OpenLinksDirectlyFingerprintPrimary.kt @@ -10,11 +10,20 @@ object OpenLinksDirectlyFingerprintPrimary : MethodFingerprint( accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, parameters = listOf("Ljava/lang/Object"), opcodes = listOf( + Opcode.RETURN_OBJECT, + Opcode.CHECK_CAST, + Opcode.INVOKE_VIRTUAL, + Opcode.MOVE_RESULT_OBJECT, + Opcode.CHECK_CAST, + Opcode.RETURN_OBJECT, + Opcode.CHECK_CAST, Opcode.INVOKE_STATIC, Opcode.MOVE_RESULT_OBJECT, Opcode.RETURN_OBJECT, - Opcode.CHECK_CAST, - Opcode.SGET, - Opcode.SGET_OBJECT - ) + Opcode.CHECK_CAST + ), + customFingerprint = { methodDef, classDef -> + methodDef.name == "a" + && classDef.methods.count() == 3 + } ) \ No newline at end of file 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 24b333e86..4cd8ed2d9 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 @@ -33,7 +33,8 @@ 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" ] ) ] 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 1a4e9a9a4..7b55c39a9 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 @@ -45,7 +45,8 @@ 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" ] ) ] 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 86648e4f5..6cdc55a98 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 @@ -33,7 +33,8 @@ import org.w3c.dom.Element "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39" ] ) ] 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 1c3d0fc51..4ed7a37d4 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 @@ -34,7 +34,8 @@ 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" ] ) ] 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 b0b9383b0..254524239 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 @@ -29,7 +29,8 @@ 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" ] ) ] 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 580eb20f9..d37ba702f 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 @@ -36,7 +36,8 @@ 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" ] ) ] 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 65f88db64..213e4e2db 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 @@ -35,7 +35,8 @@ 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" ] ) ] 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 003f70f27..8804e9742 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 @@ -47,7 +47,8 @@ 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" ] ) ] 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 ea5622d0b..f119e9fef 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 @@ -36,7 +36,8 @@ 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" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/download/pip/fingerprints/PiPPlaybackFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/download/pip/fingerprints/PiPPlaybackFingerprint.kt index 637851829..2eb6f8f9b 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/download/pip/fingerprints/PiPPlaybackFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/overlaybutton/download/pip/fingerprints/PiPPlaybackFingerprint.kt @@ -1,13 +1,10 @@ package app.revanced.patches.youtube.overlaybutton.download.pip.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 PiPPlaybackFingerprint : MethodFingerprint( returnType = "Z", - accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC, parameters = listOf("Lcom/google/android/libraries/youtube/innertube/model/player/PlayerResponseModel;"), opcodes = listOf( Opcode.INVOKE_INTERFACE, 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 1570f5654..8bf66f28b 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 @@ -53,7 +53,8 @@ import org.w3c.dom.Element "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39" ] ) ] 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 eeec09c82..e029374f5 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 @@ -43,7 +43,8 @@ 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" ] ) ] 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 67a7e926c..4944ae3f1 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 @@ -39,7 +39,8 @@ 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" ] ) ] 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 10237f105..73dd283c9 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 @@ -32,7 +32,8 @@ 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" ] ) ] 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 9dd701a59..fa196e1d7 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 @@ -33,7 +33,8 @@ 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" ] ) ] 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 40a90bb34..d8846dc3f 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 @@ -40,7 +40,8 @@ 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" ] ) ] 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 49b78dee2..00c9c2ee3 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 @@ -6,6 +6,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWith 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.PatchException import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod @@ -52,7 +53,8 @@ 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" ] ) ] @@ -84,12 +86,11 @@ object HideFilmstripOverlayPatch : BytecodePatch( FineScrubbingOverlayFingerprint.result?.let { it.mutableMethod.apply { - val setOnClickListenerIndex = getIndex("setOnClickListener") - val jumpIndex = setOnClickListenerIndex + 3 - val initialIndex = setOnClickListenerIndex - 1 - if (SettingsPatch.upward1828) { var insertIndex = it.scanResult.patternScanResult!!.startIndex + 2 + val jumpIndex = getTargetIndexUpTo(insertIndex, Opcode.GOTO, Opcode.GOTO_16) + val initialIndex = jumpIndex - 1 + if (getInstruction(insertIndex).opcode == Opcode.INVOKE_VIRTUAL) insertIndex++ @@ -109,6 +110,10 @@ object HideFilmstripOverlayPatch : BytecodePatch( ) removeInstruction(insertIndex) } else { + val setOnClickListenerIndex = getIndex("setOnClickListener") + val jumpIndex = setOnClickListenerIndex + 3 + val initialIndex = setOnClickListenerIndex - 1 + val insertIndex = getIndex("bringChildToFront") + 1 val insertRegister = getInstruction(insertIndex).registerA @@ -204,6 +209,20 @@ object HideFilmstripOverlayPatch : BytecodePatch( } } + private fun MutableMethod.getTargetIndexUpTo( + startIndex: Int, + opcode1: Opcode, + opcode2: Opcode + ): Int { + for (index in startIndex until implementation!!.instructions.size) { + if (getInstruction(index).opcode != opcode1 && getInstruction(index).opcode != opcode2) + continue + + return index + } + throw PatchException("Failed to find hook method") + } + private fun MutableMethod.injectHook() { addInstructionsWithLabels( 0, """ 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 a09c868da..26481b89c 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 @@ -42,7 +42,8 @@ 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" ] ) ] 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 0ab75a224..dbdb476b0 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 @@ -39,7 +39,8 @@ 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" ] ) ] 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 b9b6513ae..e7aa887ee 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 @@ -38,7 +38,8 @@ 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" ] ) ] 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 23a1b807c..a7d047a23 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 @@ -36,7 +36,8 @@ 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" ] ) ] 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 4c11c4d49..de50b0ec6 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 @@ -42,7 +42,8 @@ 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" ] ) ] 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 bec04bc6c..ff35878b3 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 @@ -32,7 +32,8 @@ 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" ] ) ] 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 9c8c00b3a..1f43f17ff 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 @@ -7,16 +7,18 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch +import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod import app.revanced.patcher.util.smali.ExternalLabel import app.revanced.patches.youtube.player.seekmessage.fingerprints.SeekEduContainerFingerprint import app.revanced.patches.youtube.player.seekmessage.fingerprints.SeekEduUndoOverlayFingerprint import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.SeekUndoEduOverlayStub import app.revanced.patches.youtube.utils.settings.SettingsPatch -import app.revanced.util.bytecode.getWideLiteralIndex import app.revanced.util.integrations.Constants.PLAYER import com.android.tools.smali.dexlib2.Opcode +import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction +import com.android.tools.smali.dexlib2.iface.instruction.WideLiteralInstruction import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c import com.android.tools.smali.dexlib2.iface.reference.MethodReference @@ -45,7 +47,8 @@ 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" ] ) ] @@ -77,7 +80,11 @@ object SeekMessagePatch : BytecodePatch( */ SeekEduUndoOverlayFingerprint.result?.let { it.mutableMethod.apply { - val insertIndex = getWideLiteralIndex(SeekUndoEduOverlayStub) + val seekUndoCalls = implementation!!.instructions.withIndex() + .filter { instruction -> + (instruction.value as? WideLiteralInstruction)?.wideLiteral == SeekUndoEduOverlayStub + } + val insertIndex = seekUndoCalls.elementAt(seekUndoCalls.size - 1).index val insertRegister = getInstruction(insertIndex).registerA for (index in insertIndex until implementation!!.instructions.size) { 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 8d9cf2e51..5f5fcff1d 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 @@ -43,7 +43,8 @@ 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" ] ) ] 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 05b7bcd8e..f41a8c50d 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 @@ -44,7 +44,8 @@ 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" ] ) ] 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 b4006be13..7cce6460e 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 @@ -41,7 +41,8 @@ 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" ] ) ] 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 71a63d618..7553610f3 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 @@ -46,7 +46,8 @@ 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" ] ) ] 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 8d0e36260..756a2d99a 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 @@ -51,7 +51,8 @@ import org.w3c.dom.Element "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39" ] ) ] 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 c8449970b..098410fac 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 @@ -39,7 +39,8 @@ 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" ] ) ] 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 1d20fa0f3..877aa46cb 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 @@ -36,7 +36,8 @@ 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" ] ) ] 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 dce0711a2..8fed51c1b 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 @@ -34,7 +34,8 @@ 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" ] ) ] 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 b6dd618bf..808f119bd 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 @@ -39,7 +39,8 @@ 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" ] ) ] 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 cc8711a77..0635e99c4 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 @@ -69,7 +69,8 @@ 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" ] ) ] 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 758594c21..cb410ef9f 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 @@ -36,7 +36,8 @@ 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" ] ) ] 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 1ea3e49f0..d3cb08829 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 @@ -48,7 +48,8 @@ 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" ] ) ] 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 0e9880067..e79be3b2f 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 @@ -49,7 +49,8 @@ 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" ] ) ] 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 91727b6ec..7206c22a2 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 @@ -41,7 +41,8 @@ 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" ] ) ] 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 d630c0dce..df8ad6afc 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 @@ -61,7 +61,8 @@ 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" ] ) ] 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 fd869007b..e20c08504 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 @@ -48,7 +48,8 @@ import java.util.concurrent.TimeUnit "18.37.36", "18.38.44", "18.39.41", - "18.40.34" + "18.40.34", + "18.41.39" ] ) ], 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 4d4ddd6de..0827157cc 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 @@ -35,7 +35,8 @@ 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" ] ) ] 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 cf1121d54..c181bbcb9 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 @@ -33,7 +33,8 @@ 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" ] ) ] 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 312e92336..5ea374748 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 @@ -35,7 +35,8 @@ 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" ] ) ] 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 9ec5f4f2f..03390e90a 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 @@ -50,7 +50,8 @@ 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" ] ) ] 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 8f6a0209d..357ee565f 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 @@ -42,7 +42,8 @@ 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" ] ) ] diff --git a/src/main/resources/youtube/settings/values-v21/strings.xml b/src/main/resources/youtube/settings/values-v21/strings.xml index c4b94193c..cab05ed6f 100644 --- a/src/main/resources/youtube/settings/values-v21/strings.xml +++ b/src/main/resources/youtube/settings/values-v21/strings.xml @@ -98,5 +98,5 @@ @string/sb_skipped_preview_beginning @string/sb_skipped_preview_beginning - @string/pref_offline_smart_downloads_loading + @string/aag_widget_loading