diff --git a/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt b/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt index 0365284d8..94f41526c 100644 --- a/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt +++ b/src/main/kotlin/app/revanced/patches/backdrops/misc/pro/patch/ProUnlockPatch.kt @@ -1,15 +1,14 @@ package app.revanced.patches.backdrops.misc.pro.patch +import app.revanced.extensions.toErrorResult import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version import app.revanced.patcher.data.BytecodeContext -import app.revanced.patcher.extensions.MethodFingerprintExtensions.name import app.revanced.patcher.extensions.addInstructions import app.revanced.patcher.extensions.instruction import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.PatchResult -import app.revanced.patcher.patch.PatchResultError import app.revanced.patcher.patch.PatchResultSuccess import app.revanced.patcher.patch.annotations.Patch import app.revanced.patches.backdrops.misc.pro.annotations.ProUnlockCompatibility @@ -25,17 +24,20 @@ class ProUnlockPatch : BytecodePatch( listOf(ProUnlockFingerprint) ) { override fun execute(context: BytecodeContext): PatchResult { - val result = ProUnlockFingerprint.result ?: return PatchResultError("${ProUnlockFingerprint.name} not found") + ProUnlockFingerprint.result?.let { result -> + val registerIndex = result.scanResult.patternScanResult!!.endIndex - 1 - val moveRegisterInstruction = result.mutableMethod.instruction(result.scanResult.patternScanResult!!.endIndex - 1) - val register = (moveRegisterInstruction as OneRegisterInstruction).registerA + result.mutableMethod.apply { + val register = instruction(registerIndex).registerA + addInstructions( + result.scanResult.patternScanResult!!.endIndex, + """ + const/4 v$register, 0x1 + """ + ) + } - result.mutableMethod.addInstructions( - result.scanResult.patternScanResult!!.endIndex, - """ - const/4 v$register, 0x1 - """ - ) + } ?: return ProUnlockFingerprint.toErrorResult() return PatchResultSuccess() } diff --git a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt index 5eb220cfc..6ba2dd958 100644 --- a/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/instagram/patches/ads/timeline/patch/HideTimelineAdsPatch.kt @@ -55,8 +55,8 @@ class HideTimelineAdsPatch : BytecodePatch( val scanStart = scanResult.patternScanResult!!.startIndex val jumpIndex = scanStart - 1 - val mediaInstanceRegister = (mutableMethod.instruction(scanStart) as FiveRegisterInstruction).registerC - val freeRegister = (mutableMethod.instruction(jumpIndex) as OneRegisterInstruction).registerA + val mediaInstanceRegister = mutableMethod.instruction(scanStart).registerC + val freeRegister = mutableMethod.instruction(jumpIndex).registerA val returnFalseLabel = "an_ad" diff --git a/src/main/kotlin/app/revanced/patches/shared/misc/fix/spoof/patch/ClientSpoofPatch.kt b/src/main/kotlin/app/revanced/patches/shared/misc/fix/spoof/patch/ClientSpoofPatch.kt index 161f960ee..e16dbc350 100644 --- a/src/main/kotlin/app/revanced/patches/shared/misc/fix/spoof/patch/ClientSpoofPatch.kt +++ b/src/main/kotlin/app/revanced/patches/shared/misc/fix/spoof/patch/ClientSpoofPatch.kt @@ -30,7 +30,8 @@ class ClientSpoofPatch : BytecodePatch( UserAgentHeaderBuilderFingerprint.result?.let { result -> val insertIndex = result.scanResult.patternScanResult!!.endIndex result.mutableMethod.apply { - val packageNameRegister = (instruction(insertIndex) as FiveRegisterInstruction).registerD + val packageNameRegister = instruction(insertIndex).registerD + addInstruction(insertIndex, "const-string v$packageNameRegister, \"$ORIGINAL_PACKAGE_NAME\"") } diff --git a/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt b/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt index 557ccb5a3..1096e7fe3 100644 --- a/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt +++ b/src/main/kotlin/app/revanced/patches/shared/misc/fix/verticalscroll/patch/VerticalScrollPatch.kt @@ -20,19 +20,17 @@ class VerticalScrollPatch : BytecodePatch( listOf(CanScrollVerticallyFingerprint) ) { override fun execute(context: BytecodeContext): PatchResult { - val result = CanScrollVerticallyFingerprint.result ?: return CanScrollVerticallyFingerprint.toErrorResult() + CanScrollVerticallyFingerprint.result?.let { + it.mutableMethod.apply { + val insertIndex = it.scanResult.patternScanResult!!.endIndex + val moveResultRegister = instruction(insertIndex - 1).registerA - with(result) { - val method = mutableMethod - - val moveResultIndex = scanResult.patternScanResult!!.endIndex - val moveResultRegister = (method.instruction(moveResultIndex) as OneRegisterInstruction).registerA - - method.addInstruction( - moveResultIndex + 1, - "const/4 v$moveResultRegister, 0x0" - ) - } + addInstruction( + insertIndex, + "const/4 v$moveResultRegister, 0x0" + ) + } + } ?: return CanScrollVerticallyFingerprint.toErrorResult() return PatchResultSuccess() } diff --git a/src/main/kotlin/app/revanced/patches/spotify/audio/bytecode/patch/DisableCaptureRestrictionBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/spotify/audio/bytecode/patch/DisableCaptureRestrictionBytecodePatch.kt index 88aae6a28..c2ba196ab 100644 --- a/src/main/kotlin/app/revanced/patches/spotify/audio/bytecode/patch/DisableCaptureRestrictionBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/spotify/audio/bytecode/patch/DisableCaptureRestrictionBytecodePatch.kt @@ -50,6 +50,8 @@ class DisableCaptureRestrictionBytecodePatch : BytecodePatch( // Store register of the integer parameter for setAllowedCapturePolicy invokeParamRegister = (instruction as FiveRegisterInstruction).registerD invokePosition = index + + break } if(invokePosition == null || invokeParamRegister == null) diff --git a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt index 0fcd0943d..42cd5a0d5 100644 --- a/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/settings/patch/SettingsPatch.kt @@ -25,7 +25,6 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction import org.jf.dexlib2.iface.instruction.ReferenceInstruction import org.jf.dexlib2.iface.instruction.formats.Instruction35c import org.jf.dexlib2.iface.reference.StringReference -import org.jf.dexlib2.iface.reference.TypeReference @Patch @DependsOn([IntegrationsPatch::class]) @@ -96,7 +95,7 @@ class SettingsPatch : BytecodePatch( private fun patchOptionNameAndOnClickEvent(index: Int, context: BytecodeContext) { with(SettingsOnViewCreatedFingerprint.result!!.mutableMethod) { // Patch option name - val overrideRegister = (instruction(index - 4) as OneRegisterInstruction).registerA + val overrideRegister = instruction(index - 4).registerA replaceInstruction( index - 4, """ @@ -105,16 +104,14 @@ class SettingsPatch : BytecodePatch( ) // Patch option OnClick Event - with(((instruction(index) as ReferenceInstruction).reference as TypeReference).type) { - context.findClass(this)!!.mutableClass.methods.first { it.name == "onClick" } - .addInstructions( - 0, - """ - invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsMenu;->startSettingsActivity()V - return-void - """ - ) - } + val type = instruction(index).reference.toString() + context.findClass(type)!!.mutableClass.methods.first { type == "onClick" }.addInstructions( + 0, + """ + invoke-static {}, Lapp/revanced/tiktok/settingsmenu/SettingsMenu;->startSettingsActivity()V + return-void + """ + ) } } } \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/tiktok/misc/spoof/sim/patch/SpoofSimPatch.kt b/src/main/kotlin/app/revanced/patches/tiktok/misc/spoof/sim/patch/SpoofSimPatch.kt index 822a2e2fb..d193ab61d 100644 --- a/src/main/kotlin/app/revanced/patches/tiktok/misc/spoof/sim/patch/SpoofSimPatch.kt +++ b/src/main/kotlin/app/revanced/patches/tiktok/misc/spoof/sim/patch/SpoofSimPatch.kt @@ -97,14 +97,14 @@ class SpoofSimPatch : BytecodePatch() { // Patch Android API and return fake sim information private fun MutableMethod.replaceReference(index: Int, replacement: String) { - val resultReg = (instruction(index + 1) as OneRegisterInstruction).registerA + val resultReg = instruction(index + 1).registerA addInstructions( index + 2, - """ - invoke-static {v$resultReg}, Lapp/revanced/tiktok/spoof/sim/SpoofSimPatch;->$replacement(Ljava/lang/String;)Ljava/lang/String; - move-result-object v$resultReg - """ + """ + invoke-static {v$resultReg}, Lapp/revanced/tiktok/spoof/sim/SpoofSimPatch;->$replacement(Ljava/lang/String;)Ljava/lang/String; + move-result-object v$resultReg + """ ) } } \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt index dba6e833e..a52173946 100644 --- a/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt +++ b/src/main/kotlin/app/revanced/patches/twitch/chat/antidelete/patch/ShowDeletedMessagesPatch.kt @@ -4,8 +4,12 @@ import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version import app.revanced.patcher.data.BytecodeContext -import app.revanced.patcher.extensions.* -import app.revanced.patcher.patch.* +import app.revanced.patcher.extensions.addInstruction +import app.revanced.patcher.extensions.addInstructions +import app.revanced.patcher.extensions.instruction +import app.revanced.patcher.patch.BytecodePatch +import app.revanced.patcher.patch.PatchResult +import app.revanced.patcher.patch.PatchResultSuccess import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patcher.util.smali.ExternalLabel @@ -13,7 +17,9 @@ import app.revanced.patches.shared.settings.preference.impl.ArrayResource import app.revanced.patches.shared.settings.preference.impl.ListPreference import app.revanced.patches.shared.settings.preference.impl.StringResource import app.revanced.patches.twitch.chat.antidelete.annotations.ShowDeletedMessagesCompatibility -import app.revanced.patches.twitch.chat.antidelete.fingerprints.* +import app.revanced.patches.twitch.chat.antidelete.fingerprints.ChatUtilCreateDeletedSpanFingerprint +import app.revanced.patches.twitch.chat.antidelete.fingerprints.DeletedMessageClickableSpanCtorFingerprint +import app.revanced.patches.twitch.chat.antidelete.fingerprints.SetHasModAccessFingerprint import app.revanced.patches.twitch.misc.integrations.patch.IntegrationsPatch import app.revanced.patches.twitch.misc.settings.bytecode.patch.SettingsPatch diff --git a/src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt index d0f8b7214..95ef7bed2 100644 --- a/src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/twitch/misc/settings/bytecode/patch/SettingsPatch.kt @@ -4,7 +4,9 @@ import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version import app.revanced.patcher.data.BytecodeContext -import app.revanced.patcher.extensions.* +import app.revanced.patcher.extensions.addInstructions +import app.revanced.patcher.extensions.instruction +import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.PatchResult @@ -19,7 +21,10 @@ import app.revanced.patches.shared.settings.util.AbstractPreferenceScreen import app.revanced.patches.twitch.misc.integrations.patch.IntegrationsPatch import app.revanced.patches.twitch.misc.settings.annotations.SettingsCompatibility import app.revanced.patches.twitch.misc.settings.components.CustomPreferenceCategory -import app.revanced.patches.twitch.misc.settings.fingerprints.* +import app.revanced.patches.twitch.misc.settings.fingerprints.MenuGroupsOnClickFingerprint +import app.revanced.patches.twitch.misc.settings.fingerprints.MenuGroupsUpdatedFingerprint +import app.revanced.patches.twitch.misc.settings.fingerprints.SettingsActivityOnCreateFingerprint +import app.revanced.patches.twitch.misc.settings.fingerprints.SettingsMenuItemEnumFingerprint import app.revanced.patches.twitch.misc.settings.resource.patch.SettingsResourcePatch import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.immutable.ImmutableField diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralAdsPatch.kt index 9bcc728a4..7f737c565 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralAdsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralAdsPatch.kt @@ -1,6 +1,7 @@ package app.revanced.patches.youtube.ad.general.bytecode.patch import app.revanced.extensions.findMutableMethodOf +import app.revanced.extensions.toErrorResult import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version @@ -9,16 +10,15 @@ import app.revanced.patcher.extensions.addInstruction import app.revanced.patcher.extensions.instruction import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.PatchResult -import app.revanced.patcher.patch.PatchResultError import app.revanced.patcher.patch.PatchResultSuccess import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod +import app.revanced.patches.shared.misc.fix.verticalscroll.patch.VerticalScrollPatch import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility import app.revanced.patches.youtube.ad.general.bytecode.fingerprints.ReelConstructorFingerprint import app.revanced.patches.youtube.ad.general.resource.patch.GeneralAdsResourcePatch import app.revanced.patches.youtube.misc.fix.backtoexitgesture.patch.FixBackToExitGesturePatch -import app.revanced.patches.shared.misc.fix.verticalscroll.patch.VerticalScrollPatch import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction import org.jf.dexlib2.iface.instruction.formats.Instruction31i import org.jf.dexlib2.iface.instruction.formats.Instruction35c @@ -71,20 +71,16 @@ class GeneralAdsPatch : BytecodePatch( } } - with( - ReelConstructorFingerprint.result - ?: return PatchResultError("Could not resolve fingerprint") - ) { + ReelConstructorFingerprint.result?.let { // iput-object v$viewRegister, ... - val insertIndex = this.scanResult.patternScanResult!!.startIndex + 2 + val insertIndex = it.scanResult.patternScanResult!!.startIndex + 2 - with(this.mutableMethod) { - val viewRegister = (instruction(insertIndex) as TwoRegisterInstruction).registerA + it.mutableMethod.apply { + val viewRegister = instruction(insertIndex).registerA injectHideCall(insertIndex, viewRegister, "hideReelView") } - - } + } ?: return ReelConstructorFingerprint.toErrorResult() return PatchResultSuccess() } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt index 2700bbad9..a5cec3b2e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/patch/HideAutoplayButtonPatch.kt @@ -69,7 +69,7 @@ class HideAutoplayButtonPatch : BytecodePatch( val jumpInstruction = layoutGenMethodInstructions[insertIndex + branchIndex] as Instruction // can be clobbered because this register is overwritten after the injected code - val clobberRegister = (instruction(insertIndex) as OneRegisterInstruction).registerA + val clobberRegister = instruction(insertIndex).registerA addInstructions( insertIndex, diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/patch/NavigationButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/patch/NavigationButtonsPatch.kt index 4a2f584ab..1bf21e490 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/patch/NavigationButtonsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/patch/NavigationButtonsPatch.kt @@ -149,7 +149,7 @@ class NavigationButtonsPatch : BytecodePatch(listOf(AddCreateButtonViewFingerpri }!!.index val conditionalCheckIndex = stringIndex - 1 - val conditionRegister = (instruction(conditionalCheckIndex) as OneRegisterInstruction).registerA + val conditionRegister = instruction(conditionalCheckIndex).registerA addInstructions( conditionalCheckIndex, diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/utils/InjectionUtils.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/utils/InjectionUtils.kt index ae60c1aa7..98036c67e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/utils/InjectionUtils.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/utils/InjectionUtils.kt @@ -20,7 +20,7 @@ internal object InjectionUtils { // Register to pass to the hook val registerIndex = insertIndex - 1 // MOVE_RESULT_OBJECT is always the previous instruction - val register = (injectTarget.instruction(registerIndex) as OneRegisterInstruction).registerA + val register = injectTarget.instruction(registerIndex).registerA injectTarget.addInstruction( insertIndex, diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/patch/HidePlayerButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/patch/HidePlayerButtonsPatch.kt index 1ea9cfbad..451b0dff5 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/patch/HidePlayerButtonsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/patch/HidePlayerButtonsPatch.kt @@ -55,7 +55,7 @@ class HidePlayerButtonsPatch : BytecodePatch( PlayerControlsVisibilityModelFingerprint.result?.apply { val callIndex = scanResult.patternScanResult!!.endIndex - val callInstruction = mutableMethod.instruction(callIndex) as Instruction3rc + val callInstruction = mutableMethod.instruction(callIndex) // overriding this parameter register hides the previous and next buttons val hasNextParameterRegister = callInstruction.startRegister + ParameterOffsets.HAS_NEXT diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt index f9ae2950e..bebceae5f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/bytecode/patch/AlbumCardsPatch.kt @@ -1,5 +1,6 @@ package app.revanced.patches.youtube.layout.hide.albumcards.bytecode.patch +import app.revanced.extensions.toErrorResult import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version @@ -29,16 +30,22 @@ class AlbumCardsPatch : BytecodePatch( ) ) { override fun execute(context: BytecodeContext): PatchResult { - val albumCardsResult = AlbumCardsFingerprint.result!! - val albumCardsMethod = albumCardsResult.mutableMethod + AlbumCardsFingerprint.result?.let { + it.mutableMethod.apply { + val checkCastAnchorIndex = it.scanResult.patternScanResult!!.endIndex + val insertIndex = checkCastAnchorIndex + 1 - val checkCastAnchorIndex = albumCardsResult.scanResult.patternScanResult!!.endIndex + val albumCardViewRegister = instruction(checkCastAnchorIndex).registerA - albumCardsMethod.addInstruction( - checkCastAnchorIndex + 1, """ - invoke-static {v${(albumCardsMethod.instruction(checkCastAnchorIndex) as OneRegisterInstruction).registerA}}, Lapp/revanced/integrations/patches/HideAlbumCardsPatch;->hideAlbumCards(Landroid/view/View;)V - """ - ) + addInstruction( + insertIndex, + "invoke-static {v$albumCardViewRegister}, " + + "Lapp/revanced/integrations/patches/HideAlbumCardsPatch;" + + "->" + + "hideAlbumCards(Landroid/view/View;)V" + ) + } + } ?: return AlbumCardsFingerprint.toErrorResult() return PatchResultSuccess() } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/patch/BreakingNewsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/patch/BreakingNewsPatch.kt index 0b5cf1182..d11423ed3 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/patch/BreakingNewsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/bytecode/patch/BreakingNewsPatch.kt @@ -1,5 +1,6 @@ package app.revanced.patches.youtube.layout.hide.breakingnews.bytecode.patch +import app.revanced.extensions.toErrorResult import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version @@ -24,22 +25,29 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction @BreakingNewsCompatibility @Version("0.0.1") class BreakingNewsPatch : BytecodePatch( - listOf( - BreakingNewsFingerprint, - ) + listOf(BreakingNewsFingerprint) ) { override fun execute(context: BytecodeContext): PatchResult { - val breakingNewsResult = BreakingNewsFingerprint.result!! - val breakingNewsMethod = breakingNewsResult.mutableMethod + BreakingNewsFingerprint.result?.let { + val insertIndex = it.scanResult.patternScanResult!!.endIndex - 1 + val moveResultIndex = insertIndex - 1 - val moveResultObjectIndex = - breakingNewsResult.scanResult.patternScanResult!!.endIndex - 2 + it.mutableMethod.apply { + val breakingNewsViewRegister = instruction(moveResultIndex).registerA + + addInstruction( + insertIndex, + """ + invoke-static {v$breakingNewsViewRegister}, + Lapp/revanced/integrations/patches/HideBreakingNewsPatch; + -> + hideBreakingNews(Landroid/view/View;)V + """ + ) + } + + } ?: return BreakingNewsFingerprint.toErrorResult() - breakingNewsMethod.addInstruction( - moveResultObjectIndex + 1, """ - invoke-static {v${(breakingNewsMethod.instruction(moveResultObjectIndex) as OneRegisterInstruction).registerA}}, Lapp/revanced/integrations/patches/HideBreakingNewsPatch;->hideBreakingNews(Landroid/view/View;)V - """ - ) return PatchResultSuccess() } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/bytecode/patch/CommentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/bytecode/patch/CommentsPatch.kt index 7e6708278..1bdbad8a9 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/bytecode/patch/CommentsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/bytecode/patch/CommentsPatch.kt @@ -1,5 +1,6 @@ package app.revanced.patches.youtube.layout.hide.comments.bytecode.patch +import app.revanced.extensions.toErrorResult import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version @@ -32,9 +33,6 @@ class CommentsPatch : BytecodePatch( ) ) { override fun execute(context: BytecodeContext): PatchResult { - val shortsCommentsButtonResult = ShortsCommentsButtonFingerprint.result!! - val shortsCommentsButtonMethod = shortsCommentsButtonResult.mutableMethod - val checkCastAnchorFingerprint = object : MethodFingerprint( opcodes = listOf( Opcode.CONST, @@ -47,15 +45,24 @@ class CommentsPatch : BytecodePatch( ) ) {} - val checkCastAnchorIndex = checkCastAnchorFingerprint.also { - it.resolve(context, shortsCommentsButtonMethod, shortsCommentsButtonResult.classDef) - }.result!!.scanResult.patternScanResult!!.endIndex + ShortsCommentsButtonFingerprint.result?.let { + it.mutableMethod.apply { + val checkCastAnchorIndex = checkCastAnchorFingerprint.also { result -> + if (!result.resolve(context, this, it.classDef)) + throw checkCastAnchorFingerprint.toErrorResult() + }.result!!.scanResult.patternScanResult!!.endIndex - shortsCommentsButtonMethod.addInstructions( - checkCastAnchorIndex + 1, """ - invoke-static {v${(shortsCommentsButtonMethod.instruction(checkCastAnchorIndex) as OneRegisterInstruction).registerA}}, Lapp/revanced/integrations/patches/HideShortsCommentsButtonPatch;->hideShortsCommentsButton(Landroid/view/View;)V - """ - ) + val shortsCommentsButtonRegister = instruction(checkCastAnchorIndex).registerA + val insertIndex = checkCastAnchorIndex + 1 + + addInstructions( + insertIndex, + """ + invoke-static {v$shortsCommentsButtonRegister, Lapp/revanced/integrations/patches/HideShortsCommentsButtonPatch;->hideShortsCommentsButton(Landroid/view/View;)V + """ + ) + } + } ?: return ShortsCommentsButtonFingerprint.toErrorResult() return PatchResultSuccess() } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt index 94d3b103f..c6373f635 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/bytecode/patch/CrowdfundingBoxPatch.kt @@ -33,7 +33,7 @@ class CrowdfundingBoxPatch : BytecodePatch( CrowdfundingBoxFingerprint.result?.let { it.mutableMethod.apply { val insertIndex = it.scanResult.patternScanResult!!.endIndex - val objectRegister = (instruction(insertIndex) as TwoRegisterInstruction).registerA + val objectRegister = instruction(insertIndex).registerA addInstruction(insertIndex, "invoke-static {v$objectRegister}, $INTEGRATIONS_METHOD_DESCRIPTOR") } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/patch/HideEndscreenCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/patch/HideEndscreenCardsPatch.kt index 69adc82c6..624e3c4eb 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/patch/HideEndscreenCardsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/bytecode/patch/HideEndscreenCardsPatch.kt @@ -1,5 +1,6 @@ package app.revanced.patches.youtube.layout.hide.endscreencards.bytecode.patch +import app.revanced.extensions.toErrorResult import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version @@ -35,19 +36,23 @@ class HideEndscreenCardsPatch : BytecodePatch( ) { override fun execute(context: BytecodeContext): PatchResult { fun MethodFingerprint.injectHideCall() { - val layoutResult = result!! - val layoutMethod = layoutResult.mutableMethod + val layoutResult = result ?: throw toErrorResult() + layoutResult.mutableMethod.apply { + val insertIndex = layoutResult.scanResult.patternScanResult!!.endIndex + 1 + val viewRegister = instruction(insertIndex - 1).registerA - val checkCastIndex = layoutResult.scanResult.patternScanResult!!.endIndex - val viewRegister = (layoutMethod.instruction(checkCastIndex) as Instruction21c).registerA - - layoutMethod.addInstruction( - checkCastIndex + 1, - "invoke-static { v$viewRegister }, Lapp/revanced/integrations/patches/HideEndscreenCardsPatch;->hideEndscreen(Landroid/view/View;)V" - ) + addInstruction( + insertIndex, + "invoke-static { v$viewRegister }, Lapp/revanced/integrations/patches/HideEndscreenCardsPatch;->hideEndscreen(Landroid/view/View;)V" + ) + } } - - listOf(LayoutCircleFingerprint, LayoutIconFingerprint, LayoutVideoFingerprint).forEach(MethodFingerprint::injectHideCall) + + listOf( + LayoutCircleFingerprint, + LayoutIconFingerprint, + LayoutVideoFingerprint + ).forEach(MethodFingerprint::injectHideCall) return PatchResultSuccess() } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonPatch.kt index 30f02c143..1d50b18db 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/patch/HideFloatingMicrophoneButtonPatch.kt @@ -29,7 +29,7 @@ class HideFloatingMicrophoneButtonPatch : BytecodePatch( ShowFloatingMicrophoneButtonFingerprint.result?.let { result -> with(result.mutableMethod) { val insertIndex = result.scanResult.patternScanResult!!.startIndex + 1 - val showButtonRegister = (instruction(insertIndex - 1) as TwoRegisterInstruction).registerA + val showButtonRegister = instruction(insertIndex - 1).registerA addInstructions( insertIndex, diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/getpremium/bytecode/patch/HideGetPremiumVideoAdvertisementPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/getpremium/bytecode/patch/HideGetPremiumVideoAdvertisementPatch.kt index 7e3e7b036..8c45642cd 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/getpremium/bytecode/patch/HideGetPremiumVideoAdvertisementPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/getpremium/bytecode/patch/HideGetPremiumVideoAdvertisementPatch.kt @@ -45,8 +45,9 @@ class HideGetPremiumPatch : BytecodePatch( GetPremiumViewFingerprint.result?.let { it.mutableMethod.apply { val startIndex = it.scanResult.patternScanResult!!.startIndex - val measuredWidthRegister = (instruction(startIndex) as TwoRegisterInstruction).registerA - val measuredHeightInstruction = instruction(startIndex + 1) as TwoRegisterInstruction + val measuredWidthRegister = instruction(startIndex).registerA + val measuredHeightInstruction = instruction(startIndex + 1) + val measuredHeightRegister = measuredHeightInstruction.registerA val tempRegister = measuredHeightInstruction.registerB diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/patch/HideInfoCardsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/patch/HideInfoCardsPatch.kt index 577a4da0d..d47584343 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/patch/HideInfoCardsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/patch/HideInfoCardsPatch.kt @@ -20,7 +20,8 @@ import app.revanced.patches.youtube.layout.hide.infocards.fingerprints.Infocards import app.revanced.patches.youtube.layout.hide.infocards.resource.patch.HideInfocardsResourcePatch import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch import org.jf.dexlib2.Opcode -import org.jf.dexlib2.builder.instruction.BuilderInstruction35c +import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction +import org.jf.dexlib2.iface.instruction.ReferenceInstruction @Patch @DependsOn([IntegrationsPatch::class, HideInfocardsResourcePatch::class]) @@ -35,18 +36,17 @@ class HideInfoCardsPatch : BytecodePatch( ) ) { override fun execute(context: BytecodeContext): PatchResult { - with(InfocardsIncognitoFingerprint.also { + InfocardsIncognitoFingerprint.also { it.resolve(context, InfocardsIncognitoParentFingerprint.result!!.classDef) - }.result!!.mutableMethod) { + }.result!!.mutableMethod.apply { val invokeInstructionIndex = implementation!!.instructions.indexOfFirst { it.opcode.ordinal == Opcode.INVOKE_VIRTUAL.ordinal && - ((it as? BuilderInstruction35c)?.reference.toString() == - "Landroid/view/View;->setVisibility(I)V") + ((it as ReferenceInstruction).reference.toString() == "Landroid/view/View;->setVisibility(I)V") } addInstructions( invokeInstructionIndex, - "invoke-static {v${(instruction(invokeInstructionIndex) as? BuilderInstruction35c)?.registerC}}," + + "invoke-static {v${instruction(invokeInstructionIndex).registerC}}," + " Lapp/revanced/integrations/patches/HideInfoCardsPatch;->hideInfoCardsIncognito(Landroid/view/View;)V" ) } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/patch/HideEmailAddressPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/patch/HideEmailAddressPatch.kt index a6f443d7d..79d0e8542 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/patch/HideEmailAddressPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/personalinformation/bytecode/patch/HideEmailAddressPatch.kt @@ -1,5 +1,6 @@ package app.revanced.patches.youtube.layout.hide.personalinformation.bytecode.patch +import app.revanced.extensions.toErrorResult import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version @@ -29,23 +30,22 @@ class HideEmailAddressPatch : BytecodePatch( ) ) { override fun execute(context: BytecodeContext): PatchResult { - val accountSwitcherAccessibilityLabelResult = AccountSwitcherAccessibilityLabelFingerprint.result!! - val accountSwitcherAccessibilityLabelMethod = accountSwitcherAccessibilityLabelResult.mutableMethod + AccountSwitcherAccessibilityLabelFingerprint.result?.let { + it.mutableMethod.apply { + val setVisibilityConstIndex = it.scanResult.patternScanResult!!.endIndex - val setVisibilityConstIndex = - accountSwitcherAccessibilityLabelResult.scanResult.patternScanResult!!.endIndex + val setVisibilityConstRegister = + instruction(setVisibilityConstIndex - 2).registerA - val setVisibilityConstRegister = ( - accountSwitcherAccessibilityLabelMethod.instruction - (setVisibilityConstIndex - 2) as OneRegisterInstruction - ).registerA - - accountSwitcherAccessibilityLabelMethod.addInstructions( - setVisibilityConstIndex, """ - invoke-static {v$setVisibilityConstRegister}, Lapp/revanced/integrations/patches/HideEmailAddressPatch;->hideEmailAddress(I)I - move-result v$setVisibilityConstRegister - """ - ) + addInstructions( + setVisibilityConstIndex, + """ + invoke-static {v$setVisibilityConstRegister}, Lapp/revanced/integrations/patches/HideEmailAddressPatch;->hideEmailAddress(I)I + move-result v$setVisibilityConstRegister + """ + ) + } + } ?: return AccountSwitcherAccessibilityLabelFingerprint.toErrorResult() return PatchResultSuccess() } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt index 1686c7996..bdd75860c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt @@ -102,18 +102,21 @@ class ReturnYouTubeDislikePatch : BytecodePatch( val atomicReferenceStartIndex = TextComponentAtomicReferenceFingerprint.result!! .scanResult.patternScanResult!!.startIndex + val insertIndex = atomicReferenceStartIndex + 8 + textComponentContextFingerprintResult.mutableMethod.apply { // Get the conversion context obfuscated field name, and the registers for the AtomicReference and CharSequence val conversionContextFieldReference = - (instruction(conversionContextIndex) as ReferenceInstruction).reference + instruction(conversionContextIndex).reference + // any free register val contextRegister = - (instruction(atomicReferenceStartIndex) as TwoRegisterInstruction).registerB - val atomicReferenceRegister = - (instruction(atomicReferenceStartIndex + 5) as FiveRegisterInstruction).registerC + instruction(atomicReferenceStartIndex).registerB - val insertIndex = atomicReferenceStartIndex + 8 - val moveCharSequenceInstruction = instruction(insertIndex) as TwoRegisterInstruction + val atomicReferenceRegister = + instruction(atomicReferenceStartIndex + 5).registerC + + val moveCharSequenceInstruction = instruction(insertIndex) val charSequenceRegister = moveCharSequenceInstruction.registerB // Insert as first instructions at the control flow label. @@ -145,8 +148,8 @@ class ReturnYouTubeDislikePatch : BytecodePatch( return PatchResultError("Method signature did not match: $this $parameterTypes") val insertIndex = implementation!!.instructions.size - 1 - val spannedParameterRegister = (instruction(insertIndex) as OneRegisterInstruction).registerA - val parameter = (instruction(insertIndex - 2) as BuilderInstruction35c).reference + val spannedParameterRegister = instruction(insertIndex).registerA + val parameter = instruction(insertIndex - 2).reference if (!parameter.toString().endsWith("Landroid/text/Spanned;")) return PatchResultError("Method signature parameter did not match: $parameter") @@ -171,9 +174,12 @@ class ReturnYouTubeDislikePatch : BytecodePatch( DislikesOldLayoutTextViewFingerprint.result?.let { it.mutableMethod.apply { val startIndex = it.scanResult.patternScanResult!!.startIndex - val resourceIdentifierRegister = (instruction(startIndex) as OneRegisterInstruction).registerA - val textViewRegister = (instruction(startIndex + 4) as OneRegisterInstruction).registerA - addInstruction(startIndex + 4, + + val resourceIdentifierRegister = instruction(startIndex).registerA + val textViewRegister = instruction(startIndex + 4).registerA + + addInstruction( + startIndex + 4, "invoke-static {v$resourceIdentifierRegister, v$textViewRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->setOldUILayoutDislikes(ILandroid/widget/TextView;)V" ) } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeBytecodePatch.kt index fbc8dcefa..1b23a13d2 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/theme/bytecode/patch/ThemeBytecodePatch.kt @@ -36,7 +36,7 @@ class ThemeBytecodePatch : BytecodePatch( val putColorValueIndex = it.method.indexOfInstructionWithSeekbarId!! + 3 it.mutableMethod.apply { - val overrideRegister = (instruction(putColorValueIndex) as TwoRegisterInstruction).registerA + val overrideRegister = instruction(putColorValueIndex).registerA addInstructions( putColorValueIndex, @@ -57,7 +57,7 @@ class ThemeBytecodePatch : BytecodePatch( .getMethod() as MutableMethod method.apply { - val colorRegister = (method.instruction(0) as TwoRegisterInstruction).registerA + val colorRegister = method.instruction(0).registerA addInstructions( 0, """ diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/patch/VideoInformationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/patch/VideoInformationPatch.kt index 77f44a9ed..868de9c0c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/patch/VideoInformationPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/information/patch/VideoInformationPatch.kt @@ -93,7 +93,7 @@ class VideoInformationPatch : BytecodePatch( with(videoLengthMethodResult.mutableMethod) { val videoLengthRegisterIndex = videoLengthMethodResult.scanResult.patternScanResult!!.endIndex - 2 - val videoLengthRegister = (instruction(videoLengthRegisterIndex) as OneRegisterInstruction).registerA + val videoLengthRegister = instruction(videoLengthRegisterIndex).registerA val dummyRegisterForLong = videoLengthRegister + 1 // required for long values since they are wide addInstruction( @@ -140,7 +140,7 @@ class VideoInformationPatch : BytecodePatch( speedSelectionInsertMethod = mutableMethod speedSelectionInsertIndex = scanResult.patternScanResult!!.startIndex - 3 speedSelectionValueRegister = - (mutableMethod.instruction(speedSelectionInsertIndex) as FiveRegisterInstruction).registerD + mutableMethod.instruction(speedSelectionInsertIndex).registerD val speedSelectionMethodInstructions = mutableMethod.implementation!!.instructions setPlaybackSpeedContainerClassFieldReference = diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/remember/patch/RememberPlaybackSpeedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/remember/patch/RememberPlaybackSpeedPatch.kt index 4895e665a..3990ada02 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/remember/patch/RememberPlaybackSpeedPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/remember/patch/RememberPlaybackSpeedPatch.kt @@ -7,7 +7,9 @@ import app.revanced.patcher.annotation.Version import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.extensions.addInstructions import app.revanced.patcher.extensions.instruction -import app.revanced.patcher.patch.* +import app.revanced.patcher.patch.BytecodePatch +import app.revanced.patcher.patch.PatchResult +import app.revanced.patcher.patch.PatchResultSuccess import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patcher.util.smali.ExternalLabel diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/video/videoid/patch/VideoIdPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/video/videoid/patch/VideoIdPatch.kt index bf961de7b..fab14d7f8 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/video/videoid/patch/VideoIdPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/video/videoid/patch/VideoIdPatch.kt @@ -33,7 +33,7 @@ class VideoIdPatch : BytecodePatch( result.mutableMethod.also { insertMethod = it }.apply { - videoIdRegister = (instruction(videoIdRegisterInstructionIndex) as OneRegisterInstruction).registerA + videoIdRegister = instruction(videoIdRegisterInstructionIndex).registerA insertIndex = videoIdRegisterInstructionIndex + 1 } } ?: return VideoIdFingerprint.toErrorResult() @@ -44,7 +44,7 @@ class VideoIdPatch : BytecodePatch( result.mutableMethod.also { backgroundPlaybackMethod = it }.apply { - backgroundPlaybackVideoIdRegister = (instruction(endIndex + 1) as OneRegisterInstruction).registerA + backgroundPlaybackVideoIdRegister = instruction(endIndex + 1).registerA backgroundPlaybackInsertIndex = endIndex + 2 } } ?: return VideoIdFingerprintBackgroundPlay.toErrorResult() diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/patch/ZoomHapticsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/patch/ZoomHapticsPatch.kt index 89cccda3c..1378360ff 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/patch/ZoomHapticsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/patch/ZoomHapticsPatch.kt @@ -12,9 +12,9 @@ import app.revanced.patcher.patch.PatchResultSuccess import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch import app.revanced.patcher.util.smali.ExternalLabel -import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch import app.revanced.patches.shared.settings.preference.impl.StringResource import app.revanced.patches.shared.settings.preference.impl.SwitchPreference +import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch import app.revanced.patches.youtube.misc.zoomhaptics.annotations.ZoomHapticsCompatibility import app.revanced.patches.youtube.misc.zoomhaptics.fingerprints.ZoomHapticsFingerprint diff --git a/src/main/kotlin/app/revanced/patches/youtubevanced/ad/general/patch/HideAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtubevanced/ad/general/patch/HideAdsPatch.kt index 09fd98117..e704e983d 100644 --- a/src/main/kotlin/app/revanced/patches/youtubevanced/ad/general/patch/HideAdsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtubevanced/ad/general/patch/HideAdsPatch.kt @@ -32,7 +32,7 @@ class HideAdsPatch : BytecodePatch( ContainsAdFingerprint.result?.let { result -> result.mutableMethod.apply { val insertIndex = result.scanResult.patternScanResult!!.endIndex + 1 - val adsListRegister = (instruction(insertIndex - 2) as Instruction21c).registerA + val adsListRegister = instruction(insertIndex - 2).registerA listOf( "_buttoned_layout",