diff --git a/src/main/kotlin/app/revanced/patches/music/utils/settings/SettingsBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/music/utils/settings/SettingsBytecodePatch.kt index 756ac5fe0..d28dcf78d 100644 --- a/src/main/kotlin/app/revanced/patches/music/utils/settings/SettingsBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/utils/settings/SettingsBytecodePatch.kt @@ -30,6 +30,7 @@ object SettingsBytecodePatch : BytecodePatch( "$MUSIC_INTEGRATIONS_PATH/settingsmenu/ReVancedSettingActivity;" private const val INTEGRATIONS_FRAGMENT_CLASS_DESCRIPTOR = "$MUSIC_INTEGRATIONS_PATH/settingsmenu/ReVancedSettingsFragment;" + override fun execute(context: BytecodeContext) { /** 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 c0989347e..578503827 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 @@ -52,6 +52,7 @@ object HidePreviousNextButtonPatch : BytecodePatch( private const val INTEGRATIONS_METHOD_REFERENCE = "$PLAYER->hidePreviousNextButton(Z)Z" + override fun execute(context: BytecodeContext) { PlayerControlsVisibilityModelFingerprint.result?.let { diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/navbarindex/NavBarIndexHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/navbarindex/NavBarIndexHookPatch.kt index 0023c022c..929a62eaa 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/navbarindex/NavBarIndexHookPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/navbarindex/NavBarIndexHookPatch.kt @@ -17,9 +17,7 @@ import app.revanced.patches.youtube.utils.navbarindex.fingerprints.OnResumeFragm import app.revanced.patches.youtube.utils.navbarindex.fingerprints.SettingsActivityOnBackPressedFingerprint import app.revanced.util.integrations.Constants.UTILS_PATH import com.android.tools.smali.dexlib2.Opcode -import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction35c 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.ReferenceInstruction import com.android.tools.smali.dexlib2.iface.reference.Reference @@ -41,12 +39,14 @@ object NavBarIndexHookPatch : BytecodePatch( DefaultTabsBarFingerprint.result?.let { it.mutableMethod.apply { val targetIndex = it.scanResult.patternScanResult!!.startIndex - val setTabIndexReference = getInstruction(targetIndex).reference + val setTabIndexReference = + getInstruction(targetIndex).reference val (onClickMethod, insertIndex) = getOnClickMethod(context, setTabIndexReference) onClickMethod.apply { - val indexRegister = getInstruction(insertIndex).registerD + val indexRegister = + getInstruction(insertIndex).registerD addInstruction( insertIndex, diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/PlayerControlsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/PlayerControlsPatch.kt index b34cbfb1b..3cde1a06a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/PlayerControlsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/playercontrols/PlayerControlsPatch.kt @@ -9,6 +9,7 @@ import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.PatchException import app.revanced.patcher.patch.annotation.Patch import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod +import app.revanced.patches.youtube.utils.fingerprints.PlayerControlsVisibilityModelFingerprint import app.revanced.patches.youtube.utils.fingerprints.ThumbnailPreviewConfigFingerprint import app.revanced.patches.youtube.utils.fingerprints.YouTubeControlsOverlayFingerprint import app.revanced.patches.youtube.utils.playercontrols.fingerprints.BottomControlsInflateFingerprint @@ -16,7 +17,6 @@ import app.revanced.patches.youtube.utils.playercontrols.fingerprints.ControlsLa import app.revanced.patches.youtube.utils.playercontrols.fingerprints.FullscreenEngagementSpeedEduVisibleFingerprint import app.revanced.patches.youtube.utils.playercontrols.fingerprints.FullscreenEngagementSpeedEduVisibleParentFingerprint import app.revanced.patches.youtube.utils.playercontrols.fingerprints.PlayerControlsVisibilityFingerprint -import app.revanced.patches.youtube.utils.fingerprints.PlayerControlsVisibilityModelFingerprint import app.revanced.patches.youtube.utils.playercontrols.fingerprints.QuickSeekVisibleFingerprint import app.revanced.patches.youtube.utils.playercontrols.fingerprints.SeekEDUVisibleFingerprint import app.revanced.patches.youtube.utils.playercontrols.fingerprints.UserScrubbingFingerprint diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockBytecodePatch.kt index f8e69f6f9..26fd5ce62 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockBytecodePatch.kt @@ -22,7 +22,6 @@ import app.revanced.patches.youtube.utils.sponsorblock.fingerprints.RectangleFie import app.revanced.patches.youtube.utils.sponsorblock.fingerprints.SegmentPlaybackControllerFingerprint import app.revanced.patches.youtube.utils.videoid.general.VideoIdPatch import app.revanced.patches.youtube.utils.videoid.withoutshorts.VideoIdWithoutShortsPatch -import app.revanced.util.bytecode.BytecodeHelper.injectInit import app.revanced.util.bytecode.getWideLiteralIndex import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.builder.BuilderInstruction @@ -216,9 +215,6 @@ object SponsorBlockBytecodePatch : BytecodePatch( * Inject VideoIdPatch */ VideoIdWithoutShortsPatch.injectCall("$INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setCurrentVideoId(Ljava/lang/String;)V") - - context.injectInit("InitializationPatch", "initializeSponsorBlockSettings", true) - } private const val INTEGRATIONS_BUTTON_CLASS_DESCRIPTOR =