diff --git a/README-template.md b/README-template.md index d15ed08dc..59d5470b0 100644 --- a/README-template.md +++ b/README-template.md @@ -32,7 +32,9 @@ Example: "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] } ], 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 f56a7165f..f1e075314 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 @@ -41,7 +41,9 @@ import org.w3c.dom.Element "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 ba6a3ce25..192cf406d 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 @@ -26,7 +26,9 @@ import app.revanced.util.integrations.Constants.ADS_PATH "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 8dcd61a74..6e7cd7cb0 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 @@ -36,7 +36,9 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 a9ed9045c..3b7cbf4c7 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 @@ -30,7 +30,9 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 eb0e8ea03..90ed19eba 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 @@ -30,7 +30,9 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 54409a412..5b458fd51 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 @@ -41,7 +41,9 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 6e51a84bc..fd8a0bf2b 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 @@ -41,7 +41,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 16ac51fc0..0dab50485 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 @@ -45,7 +45,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 5a5a65079..7f111c6fa 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 @@ -40,7 +40,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 fd98aeb70..8de8f52e7 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 @@ -36,7 +36,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 9d5952a46..2f50ab087 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 @@ -35,7 +35,9 @@ import app.revanced.util.integrations.Constants.FULLSCREEN "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 e9486761d..f88cce021 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 @@ -47,7 +47,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 1a9972236..ed99b39b7 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 @@ -35,7 +35,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ], 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 0eaa56581..18cf1ad96 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 @@ -32,7 +32,9 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 d0ec9e4a5..543625dc2 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 @@ -37,7 +37,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 f0bcf692f..1520d92b6 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 @@ -41,7 +41,9 @@ import app.revanced.util.integrations.Constants.GENERAL "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 cdb388347..fb49dbe0c 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 @@ -31,7 +31,9 @@ import app.revanced.util.integrations.Constants.GENERAL "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 3a644aae3..18d55e9e9 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 @@ -39,7 +39,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 7d796669d..1487b8be6 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 @@ -35,7 +35,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 12fabe798..b84e3dac0 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 @@ -35,7 +35,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 b9e5f88e4..d954dee76 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 @@ -30,7 +30,9 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 b6dc021e3..a34ebc341 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 @@ -35,7 +35,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 7d32706d5..352358148 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 @@ -38,7 +38,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 09be8c419..6aa94e04c 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 @@ -37,7 +37,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 f542a80fa..b6811e000 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 @@ -35,7 +35,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 f37d826a5..23158ee2e 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 @@ -31,7 +31,9 @@ import app.revanced.util.integrations.Constants.PATCHES_PATH "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 48ade4ecb..12f43173e 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 @@ -33,7 +33,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 f68a51a35..3c7da51cd 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 @@ -35,7 +35,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 dd06a3082..de9cdee4a 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 @@ -19,7 +19,9 @@ import app.revanced.util.bytecode.getStringIndex import app.revanced.util.integrations.Constants.GENERAL import app.revanced.util.integrations.Constants.PATCHES_PATH import com.android.tools.smali.dexlib2.Opcode +import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction +import com.android.tools.smali.dexlib2.iface.reference.MethodReference @Patch( name = "Hide mix playlists", @@ -43,7 +45,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] @@ -108,6 +112,7 @@ object MixPlaylistsPatch : BytecodePatch( val insertIndex = methodInstructions.indexOfFirst { instruction -> instruction.opcode == Opcode.INVOKE_INTERFACE + && (instruction as? ReferenceInstruction)?.reference.toString().contains("[B") } val freeIndex = it.scanResult.patternScanResult!!.startIndex - 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 3746eae50..1ddad5a36 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 @@ -31,7 +31,9 @@ import app.revanced.util.integrations.Constants.GENERAL "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 bbf929a85..3b9f965e3 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 @@ -40,7 +40,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 636b2bf0c..126a50293 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 @@ -43,7 +43,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 6cce0f5f8..39bdf3868 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,9 @@ import app.revanced.util.integrations.Constants.GENERAL "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 6d886f8d7..0a6db3a6b 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 @@ -40,7 +40,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 9b4ae90ab..e986015cb 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 @@ -37,7 +37,9 @@ import app.revanced.util.integrations.Constants.GENERAL "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 10b026e2c..d863044de 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 @@ -27,7 +27,9 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ], 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 db66e94dd..61f625974 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 @@ -27,7 +27,9 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 998ac28e7..e6d32d499 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 @@ -27,7 +27,9 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusIcon "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ], 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 446b5b50a..9a77706a6 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 @@ -31,7 +31,9 @@ import app.revanced.util.resources.ResourceHelper.updatePatchStatusLabel "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 ac95f1a82..5eb6497df 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 @@ -25,7 +25,9 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ], 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 ed4ec1a94..23d6a6f96 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 @@ -30,7 +30,9 @@ import app.revanced.util.resources.ResourceUtils.copyResources "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 3b2da6b24..6d810ade2 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 @@ -27,7 +27,9 @@ import org.w3c.dom.Element "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ], 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 0be7f1afc..23068a21a 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 @@ -29,7 +29,9 @@ import kotlin.io.path.exists "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ], 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 8d36ea9dd..d61562059 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 @@ -34,7 +34,9 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ], 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 ed122bbd8..d1239233e 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 @@ -33,7 +33,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 ee2f8cb24..602526d3a 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 @@ -27,7 +27,9 @@ import kotlin.io.path.exists "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ], 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 2ea60b51c..068fc18a8 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 @@ -33,7 +33,9 @@ import org.w3c.dom.Element "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 91058fbfb..a6e243152 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 @@ -32,7 +32,9 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/PowerSaveModePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/PowerSaveModePatch.kt index 9c3bd94f8..4df3393e3 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/PowerSaveModePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/ambientmode/PowerSaveModePatch.kt @@ -35,7 +35,9 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 369c97fe0..eeba4b079 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 @@ -26,7 +26,9 @@ import app.revanced.util.integrations.Constants.MISC_PATH "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 56fd53ef1..013639fe0 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,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 54044b526..04dbc4b88 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 @@ -25,7 +25,9 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ], 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 ed7165fb4..dcf74ad61 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 @@ -34,7 +34,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 bc9d31a3e..deb5498ec 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 @@ -32,7 +32,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 b789d11a9..78a5e03a4 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 @@ -38,7 +38,9 @@ import com.android.tools.smali.dexlib2.Opcode "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 a08061301..2b6ef00c2 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 @@ -42,7 +42,9 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 102d7a672..431b566aa 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 @@ -32,7 +32,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 450bf070c..cf66d0a4e 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 @@ -30,7 +30,9 @@ import app.revanced.util.integrations.Constants.MISC_PATH "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 44ead80c2..d98d543fb 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 @@ -42,7 +42,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 2982e2e53..eb091c5ec 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 @@ -28,7 +28,9 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 957a25eb3..aa7f2f5ab 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 @@ -26,7 +26,9 @@ import app.revanced.util.resources.ResourceHelper.addTranslations "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 ab58261d9..33de83ced 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 @@ -33,7 +33,9 @@ import app.revanced.util.integrations.Constants.NAVIGATION "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 89a82a7af..3bf5d3949 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 @@ -32,7 +32,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 471e85fb8..66fe6410e 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 @@ -13,7 +13,9 @@ import app.revanced.patches.youtube.navigation.navigationbuttons.fingerprints.Pi import app.revanced.patches.youtube.navigation.navigationbuttons.fingerprints.PivotBarShortsButtonViewFingerprint import app.revanced.patches.youtube.utils.fingerprints.PivotBarCreateButtonViewFingerprint import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch +import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.ImageOnlyTab import app.revanced.patches.youtube.utils.settings.SettingsPatch +import app.revanced.util.bytecode.getWideLiteralIndex import app.revanced.util.integrations.Constants.NAVIGATION import app.revanced.util.pivotbar.InjectionUtils.REGISTER_TEMPLATE_REPLACEMENT import app.revanced.util.pivotbar.InjectionUtils.injectHook @@ -42,7 +44,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] @@ -94,12 +98,12 @@ object NavigationButtonsPatch : BytecodePatch( */ parentResult.mutableMethod.apply { val insertIndex = implementation!!.instructions.let { - val scanStart = parentResult.scanResult.patternScanResult!!.endIndex + val scanStart = getWideLiteralIndex(ImageOnlyTab) scanStart + it.subList(scanStart, it.size - 1).indexOfFirst { instruction -> - instruction.opcode == Opcode.INVOKE_STATIC + instruction.opcode == Opcode.INVOKE_VIRTUAL } - } + } + 2 injectHook(CREATE_BUTTON_HOOK, insertIndex) } 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 d7f2b4be1..5b44c3068 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 @@ -33,7 +33,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 f278c245f..660919d0d 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 @@ -49,7 +49,9 @@ import org.w3c.dom.Element "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 cb3e8a938..e9e55fd3a 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 @@ -40,7 +40,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 12e034c42..92ee0c0e5 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 @@ -36,7 +36,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 123d8eb6c..da0f2baea 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 @@ -29,7 +29,9 @@ import app.revanced.util.integrations.Constants.PLAYER "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 93694a4da..757f0ddde 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 @@ -30,7 +30,9 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 1f8795bad..e8e719b0e 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 @@ -37,7 +37,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 d5bf7296b..789d1009d 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 @@ -50,7 +50,9 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 dd74f142e..dc7caef95 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 @@ -38,7 +38,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 4c5eb8bc7..688c56d63 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 @@ -36,7 +36,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 0ba70ed66..cae9661c0 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 @@ -35,7 +35,9 @@ import app.revanced.util.integrations.Constants.PLAYER "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 4506c95b6..0b5a5b236 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 @@ -33,7 +33,9 @@ import app.revanced.util.integrations.Constants.INTEGRATIONS_PATH "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/fingerprints/PlayerPatchFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/fingerprints/PlayerPatchFingerprint.kt index 0e6e385fd..abb2cbe30 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/fingerprints/PlayerPatchFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/playerbuttonbg/fingerprints/PlayerPatchFingerprint.kt @@ -3,5 +3,8 @@ package app.revanced.patches.youtube.player.playerbuttonbg.fingerprints import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint object PlayerPatchFingerprint : MethodFingerprint( - customFingerprint = { methodDef, _ -> methodDef.definingClass == "Lapp/revanced/integrations/patches/layout/PlayerPatch;" && methodDef.name == "hidePlayerButton" } + customFingerprint = { methodDef, _ -> + methodDef.definingClass == "Lapp/revanced/integrations/patches/layout/PlayerPatch;" + && methodDef.name == "hidePlayerButton" + } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlayfilter/PlayerOverlayFilterPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlayfilter/PlayerOverlayFilterPatch.kt index 94f48e094..423690f8c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlayfilter/PlayerOverlayFilterPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/player/playeroverlayfilter/PlayerOverlayFilterPatch.kt @@ -39,7 +39,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 93d167305..186dbd658 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 @@ -29,7 +29,9 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 1cd6d28c2..77d35a6a7 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 @@ -35,7 +35,9 @@ import app.revanced.util.integrations.Constants.PLAYER "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 514006adc..5164e108e 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 @@ -9,6 +9,7 @@ import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch import app.revanced.patches.youtube.player.speedoverlay.fingerprints.SpeedOverlayConfigFingerprint +import app.revanced.patches.youtube.player.speedoverlay.fingerprints.SpeedOverlayHookAlternativeFingerprint import app.revanced.patches.youtube.player.speedoverlay.fingerprints.SpeedOverlayHookFingerprint import app.revanced.patches.youtube.player.speedoverlay.fingerprints.YouTubeTextViewFingerprint import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch @@ -42,7 +43,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] @@ -51,6 +54,7 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c object SpeedOverlayPatch : BytecodePatch( setOf( SpeedOverlayConfigFingerprint, + SpeedOverlayHookAlternativeFingerprint, SpeedOverlayHookFingerprint, YouTubeTextViewFingerprint ) @@ -71,7 +75,12 @@ object SpeedOverlayPatch : BytecodePatch( } } ?: throw SpeedOverlayConfigFingerprint.exception - SpeedOverlayHookFingerprint.result?.let { + val speedOverlayHookResult = + SpeedOverlayHookFingerprint.result + ?: SpeedOverlayHookAlternativeFingerprint.result + ?: throw SpeedOverlayHookFingerprint.exception + + speedOverlayHookResult.let { it.mutableMethod.apply { val insertIndex = implementation!!.instructions.indexOfFirst { instruction -> instruction.opcode == Opcode.CMPL_FLOAT @@ -80,12 +89,12 @@ object SpeedOverlayPatch : BytecodePatch( addInstructions( insertIndex, """ - invoke-static {v$insertRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->getSpeed(F)F - move-result v$insertRegister - """ + invoke-static {v$insertRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->getSpeed(F)F + move-result v$insertRegister + """ ) } - } ?: throw SpeedOverlayHookFingerprint.exception + } YouTubeTextViewFingerprint.result?.let { it.mutableMethod.apply { diff --git a/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/fingerprints/SpeedOverlayHookAlternativeFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/fingerprints/SpeedOverlayHookAlternativeFingerprint.kt new file mode 100644 index 000000000..e0be75afd --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/youtube/player/speedoverlay/fingerprints/SpeedOverlayHookAlternativeFingerprint.kt @@ -0,0 +1,57 @@ +package app.revanced.patches.youtube.player.speedoverlay.fingerprints + +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint +import com.android.tools.smali.dexlib2.Opcode + +object SpeedOverlayHookAlternativeFingerprint : MethodFingerprint( + returnType = "V", + opcodes = listOf( + Opcode.IGET_OBJECT, + Opcode.CHECK_CAST, + Opcode.INVOKE_VIRTUAL, + Opcode.IGET_OBJECT, + Opcode.CHECK_CAST, + Opcode.IGET_OBJECT, + Opcode.IGET_OBJECT, + Opcode.INVOKE_VIRTUAL, + Opcode.IGET_OBJECT, + Opcode.CHECK_CAST, + Opcode.INVOKE_VIRTUAL, + Opcode.MOVE_RESULT, + Opcode.IF_EQZ, + Opcode.IGET_OBJECT, + Opcode.CHECK_CAST, + Opcode.IGET_OBJECT, + Opcode.INVOKE_VIRTUAL, + Opcode.IGET_OBJECT, + Opcode.INVOKE_VIRTUAL, + Opcode.MOVE_RESULT, + Opcode.IF_EQZ, + Opcode.GOTO, + Opcode.IGET_OBJECT, + Opcode.INVOKE_VIRTUAL, + Opcode.MOVE_RESULT, + Opcode.INVOKE_STATIC, + Opcode.MOVE_RESULT_OBJECT, + Opcode.INVOKE_STATIC, + Opcode.MOVE_RESULT_OBJECT, + Opcode.IPUT_OBJECT, + Opcode.IGET_OBJECT, + Opcode.INVOKE_VIRTUAL, + Opcode.MOVE_RESULT_OBJECT, + Opcode.CHECK_CAST, + Opcode.INVOKE_VIRTUAL, + Opcode.MOVE_RESULT, + Opcode.IGET, + Opcode.CMPL_FLOAT, + Opcode.IF_GEZ, + Opcode.IGET_OBJECT, + Opcode.INVOKE_VIRTUAL, + Opcode.IGET_OBJECT, + Opcode.INVOKE_STATIC, + Opcode.MOVE_RESULT_OBJECT, + Opcode.INVOKE_VIRTUAL, + Opcode.RETURN_VOID + ), + customFingerprint = { methodDef, _ -> methodDef.name == "run" } +) \ No newline at end of file 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 756d12e62..a2c4e5ced 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 @@ -39,7 +39,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 524cc3453..9e937ecb7 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,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 1f2a2eecd..0745090a3 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 @@ -39,7 +39,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 23e2afb28..07574aa58 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 @@ -43,7 +43,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 0b8e5225c..00c724c16 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 @@ -48,7 +48,9 @@ import org.w3c.dom.Element "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 d65449dfb..85b3c2133 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 @@ -37,7 +37,9 @@ import app.revanced.util.integrations.Constants.SEEKBAR "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 34a1741c9..a1e975bf5 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 @@ -33,7 +33,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 ea913f79d..628ccbe79 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 @@ -31,7 +31,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 a7b65bc84..a16102f12 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 @@ -37,7 +37,9 @@ import app.revanced.util.integrations.Constants.SEEKBAR "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/commentpopuppanels/NewCommentPopupPanelsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/commentpopuppanels/NewCommentPopupPanelsPatch.kt index 8ae1b00a7..d8fc31f6d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/shorts/commentpopuppanels/NewCommentPopupPanelsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/commentpopuppanels/NewCommentPopupPanelsPatch.kt @@ -32,7 +32,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 2911664be..dd9f64acb 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 @@ -66,7 +66,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsNavigationBarPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsNavigationBarPatch.kt index 7346407b2..0c0f971b6 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsNavigationBarPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/ShortsNavigationBarPatch.kt @@ -8,15 +8,18 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod +import app.revanced.patches.youtube.shorts.shortscomponent.fingerprints.BottomNavigationBarAlternativeFingerprint import app.revanced.patches.youtube.shorts.shortscomponent.fingerprints.BottomNavigationBarFingerprint import app.revanced.patches.youtube.shorts.shortscomponent.fingerprints.RenderBottomNavigationBarFingerprint import app.revanced.patches.youtube.shorts.shortscomponent.fingerprints.SetPivotBarFingerprint import app.revanced.patches.youtube.utils.fingerprints.PivotBarCreateButtonViewFingerprint import app.revanced.util.integrations.Constants.SHORTS +import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction object ShortsNavigationBarPatch : BytecodePatch( setOf( + BottomNavigationBarAlternativeFingerprint, BottomNavigationBarFingerprint, PivotBarCreateButtonViewFingerprint, RenderBottomNavigationBarFingerprint @@ -56,6 +59,23 @@ object ShortsNavigationBarPatch : BytecodePatch( val insertIndex = it.scanResult.patternScanResult!!.endIndex val insertRegister = getInstruction(insertIndex).registerA + addInstructions( + insertIndex, """ + invoke-static {v$insertRegister}, $SHORTS->hideShortsPlayerNavigationBar(Landroid/view/View;)Landroid/view/View; + move-result-object v$insertRegister + """ + ) + } + } ?: BottomNavigationBarAlternativeFingerprint.result?.let { + it.mutableMethod.apply { + val targetIndex = it.scanResult.patternScanResult!!.endIndex + 3 + val insertIndex = + if (getInstruction(targetIndex).opcode == Opcode.IF_EQZ) + targetIndex + else + targetIndex + 1 + val insertRegister = getInstruction(insertIndex).registerA + addInstructions( insertIndex, """ invoke-static {v$insertRegister}, $SHORTS->hideShortsPlayerNavigationBar(Landroid/view/View;)Landroid/view/View; diff --git a/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/fingerprints/BottomNavigationBarAlternativeFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/fingerprints/BottomNavigationBarAlternativeFingerprint.kt new file mode 100644 index 000000000..ac620daeb --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/youtube/shorts/shortscomponent/fingerprints/BottomNavigationBarAlternativeFingerprint.kt @@ -0,0 +1,19 @@ +package app.revanced.patches.youtube.shorts.shortscomponent.fingerprints + +import app.revanced.patcher.extensions.or +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint +import com.android.tools.smali.dexlib2.AccessFlags +import com.android.tools.smali.dexlib2.Opcode + +object BottomNavigationBarAlternativeFingerprint : MethodFingerprint( + returnType = "V", + accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, + parameters = listOf("Landroid/view/View;", "Landroid/os/Bundle;"), + opcodes = listOf( + Opcode.IGET_OBJECT, + Opcode.IGET_OBJECT, + Opcode.IGET_OBJECT, + Opcode.INVOKE_VIRTUAL + ), + strings = listOf("r_pfvc", "ReelWatchPaneFragmentViewModelKey") +) \ No newline at end of file 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 7b0b5fad5..8cda5aaf2 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 @@ -33,7 +33,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 3a05ec0b7..277dd6bce 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 @@ -45,7 +45,9 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewFlyoutPanelOnClickListenerFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewVideoQualityChangedFingerprint.kt similarity index 50% rename from src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewFlyoutPanelOnClickListenerFingerprint.kt rename to src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewVideoQualityChangedFingerprint.kt index 939f9b252..76abd81b3 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewFlyoutPanelOnClickListenerFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/NewVideoQualityChangedFingerprint.kt @@ -5,44 +5,28 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -object NewFlyoutPanelOnClickListenerFingerprint : MethodFingerprint( +object NewVideoQualityChangedFingerprint : MethodFingerprint( returnType = "L", accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, parameters = listOf("L"), opcodes = listOf( + Opcode.IGET, // Video resolution (human readable). + Opcode.IGET_OBJECT, + Opcode.IGET_BOOLEAN, + Opcode.IGET_OBJECT, + Opcode.INVOKE_STATIC, + Opcode.MOVE_RESULT_OBJECT, + Opcode.INVOKE_DIRECT, + Opcode.IGET_OBJECT, + Opcode.INVOKE_INTERFACE, + Opcode.MOVE_RESULT_OBJECT, + Opcode.INVOKE_VIRTUAL, + Opcode.GOTO, + Opcode.CONST_4, + Opcode.IF_NE, + Opcode.IGET_OBJECT, + Opcode.INVOKE_INTERFACE, + Opcode.MOVE_RESULT_OBJECT, Opcode.IGET, - Opcode.AND_INT_LIT8, - Opcode.IF_EQZ, - Opcode.IGET_OBJECT, - Opcode.INVOKE_INTERFACE, - Opcode.MOVE_RESULT_OBJECT, - Opcode.INVOKE_VIRTUAL, - Opcode.MOVE_RESULT_OBJECT, - Opcode.IF_NEZ, - Opcode.NEW_INSTANCE, - Opcode.INVOKE_DIRECT, - Opcode.IGET_OBJECT, - Opcode.INVOKE_INTERFACE, - Opcode.MOVE_RESULT_OBJECT, - Opcode.INVOKE_VIRTUAL, - Opcode.MOVE_RESULT_OBJECT, - Opcode.INVOKE_STATIC, - Opcode.MOVE_RESULT_OBJECT, - Opcode.INVOKE_STATIC, - Opcode.MOVE_RESULT_OBJECT, - Opcode.INVOKE_STATIC, - Opcode.MOVE_RESULT_OBJECT, - Opcode.NEW_INSTANCE, - Opcode.CONST_16, - Opcode.INVOKE_DIRECT, - Opcode.INVOKE_INTERFACE, - Opcode.MOVE_RESULT_OBJECT, - Opcode.INVOKE_INTERFACE, - Opcode.MOVE_RESULT_OBJECT, - Opcode.IGET_OBJECT, - Opcode.INVOKE_INTERFACE, - Opcode.MOVE_RESULT_OBJECT, - Opcode.INVOKE_VIRTUAL, - Opcode.NEW_INSTANCE ) ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/PivotBarCreateButtonViewFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/PivotBarCreateButtonViewFingerprint.kt index 3eb98e2ad..517ddb254 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/PivotBarCreateButtonViewFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/fingerprints/PivotBarCreateButtonViewFingerprint.kt @@ -5,14 +5,9 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.ImageOnlyTab import app.revanced.util.bytecode.isWideLiteralExists import com.android.tools.smali.dexlib2.AccessFlags -import com.android.tools.smali.dexlib2.Opcode object PivotBarCreateButtonViewFingerprint : MethodFingerprint( returnType = "V", accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, - opcodes = listOf( - Opcode.MOVE_OBJECT, - Opcode.INVOKE_DIRECT_RANGE, // unique instruction anchor - ), customFingerprint = { methodDef, _ -> methodDef.isWideLiteralExists(ImageOnlyTab) } ) \ No newline at end of file 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 b15bf126f..e23bba07f 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 @@ -47,7 +47,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 f3dcb890d..50da9f3e2 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 @@ -38,7 +38,9 @@ import app.revanced.util.resources.ResourceHelper.setMicroG "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 5037705be..d6ce48b5b 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 @@ -59,7 +59,9 @@ import com.android.tools.smali.dexlib2.iface.reference.Reference "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 3b98dfe33..1f76cfb11 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 @@ -45,7 +45,9 @@ import java.util.concurrent.TimeUnit "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ], 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 e5d04c3da..514927e75 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 @@ -31,7 +31,9 @@ import app.revanced.util.resources.ResourceUtils.copyXmlNode "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 ecbe4fe0d..ddc40bde9 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 @@ -30,7 +30,9 @@ import app.revanced.util.integrations.Constants.VIDEO_PATH "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 a7c690873..0e8700f93 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 @@ -32,7 +32,9 @@ import app.revanced.util.integrations.Constants.VIDEO_PATH "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] 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 628101bc7..2019cd852 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 @@ -4,12 +4,11 @@ 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.fingerprint.method.impl.MethodFingerprint.Companion.resolve 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.utils.fingerprints.NewFlyoutPanelOnClickListenerFingerprint +import app.revanced.patches.youtube.utils.fingerprints.NewVideoQualityChangedFingerprint import app.revanced.patches.youtube.utils.overridequality.OverrideQualityHookPatch import app.revanced.patches.youtube.utils.overridespeed.OverrideSpeedHookPatch import app.revanced.patches.youtube.utils.playertype.PlayerTypeHookPatch @@ -17,7 +16,6 @@ import app.revanced.patches.youtube.utils.settings.SettingsPatch import app.revanced.patches.youtube.utils.settings.SettingsPatch.contexts import app.revanced.patches.youtube.utils.videoid.general.VideoIdPatch import app.revanced.patches.youtube.utils.videoid.withoutshorts.VideoIdWithoutShortsPatch -import app.revanced.patches.youtube.video.quality.fingerprints.NewVideoQualityChangedFingerprint import app.revanced.patches.youtube.video.quality.fingerprints.VideoQualitySetterFingerprint import app.revanced.util.integrations.Constants.VIDEO_PATH import app.revanced.util.resources.ResourceUtils.copyXmlNode @@ -49,7 +47,9 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] @@ -57,30 +57,24 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction @Suppress("unused") object VideoQualityPatch : BytecodePatch( setOf( - NewFlyoutPanelOnClickListenerFingerprint, + NewVideoQualityChangedFingerprint, VideoQualitySetterFingerprint ) ) { override fun execute(context: BytecodeContext) { - NewFlyoutPanelOnClickListenerFingerprint.result?.let { parentResult -> - NewVideoQualityChangedFingerprint.also { - it.resolve( - context, - parentResult.classDef - ) - }.result?.let { - it.mutableMethod.apply { - val index = it.scanResult.patternScanResult!!.endIndex - val register = getInstruction(index).registerA + NewVideoQualityChangedFingerprint.result?.let { + it.mutableMethod.apply { + val index = it.scanResult.patternScanResult!!.startIndex + val qualityRegister = getInstruction(index).registerA + + addInstruction( + index + 1, + "invoke-static {v$qualityRegister}, $INTEGRATIONS_VIDEO_QUALITY_CLASS_DESCRIPTOR->userChangedQuality(I)V" + ) - addInstruction( - index + 1, - "invoke-static {v$register}, $INTEGRATIONS_VIDEO_QUALITY_CLASS_DESCRIPTOR->userChangedQuality(I)V" - ) - } } - } ?: throw NewFlyoutPanelOnClickListenerFingerprint.exception + } ?: throw NewVideoQualityChangedFingerprint.exception VideoQualitySetterFingerprint.result?.let { val onItemClickMethod = diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/quality/fingerprints/NewVideoQualityChangedFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/video/quality/fingerprints/NewVideoQualityChangedFingerprint.kt deleted file mode 100644 index 17d3e2c41..000000000 --- a/src/main/kotlin/app/revanced/patches/youtube/video/quality/fingerprints/NewVideoQualityChangedFingerprint.kt +++ /dev/null @@ -1,21 +0,0 @@ -package app.revanced.patches.youtube.video.quality.fingerprints - -import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint -import com.android.tools.smali.dexlib2.AccessFlags -import com.android.tools.smali.dexlib2.Opcode - -object NewVideoQualityChangedFingerprint : MethodFingerprint( - returnType = "L", - accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL, - parameters = listOf("L"), - opcodes = listOf( - Opcode.IGET, - Opcode.CONST_4, - Opcode.IF_NE, - Opcode.NEW_INSTANCE, - Opcode.IGET_OBJECT, - Opcode.CHECK_CAST, - Opcode.IGET - ) -) 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 35bfbaf1d..2336afef0 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 @@ -8,7 +8,7 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion. import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch -import app.revanced.patches.youtube.utils.fingerprints.NewFlyoutPanelOnClickListenerFingerprint +import app.revanced.patches.youtube.utils.fingerprints.NewVideoQualityChangedFingerprint import app.revanced.patches.youtube.utils.overridespeed.OverrideSpeedHookPatch import app.revanced.patches.youtube.utils.settings.SettingsPatch import app.revanced.patches.youtube.utils.videocpn.VideoCpnPatch @@ -39,18 +39,20 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction "18.34.38", "18.35.36", "18.36.39", - "18.37.36" + "18.37.36", + "18.38.44", + "18.39.41" ] ) ] ) @Suppress("unused") object PlaybackSpeedPatch : BytecodePatch( - setOf(NewFlyoutPanelOnClickListenerFingerprint) + setOf(NewVideoQualityChangedFingerprint) ) { override fun execute(context: BytecodeContext) { - NewFlyoutPanelOnClickListenerFingerprint.result?.let { parentResult -> + NewVideoQualityChangedFingerprint.result?.let { parentResult -> NewPlaybackSpeedChangedFingerprint.also { it.resolve( context, @@ -69,7 +71,7 @@ object PlaybackSpeedPatch : BytecodePatch( } } } ?: throw NewPlaybackSpeedChangedFingerprint.exception - } ?: throw NewFlyoutPanelOnClickListenerFingerprint.exception + } ?: throw NewVideoQualityChangedFingerprint.exception VideoCpnPatch.injectCall("$INTEGRATIONS_PLAYBACK_SPEED_CLASS_DESCRIPTOR->newVideoStarted(Ljava/lang/String;Z)V")