From 1b83a30a56c65ed3e2e09058478ffd76d44b93a6 Mon Sep 17 00:00:00 2001 From: inotia00 Date: Mon, 9 Jan 2023 04:10:53 +0900 Subject: [PATCH] cleanup --- .../patch/CreateButtonRemoverBytecodePatch.kt | 10 +- .../UserWasInShortsFingerprint.kt | 13 +- .../patch/HideShortsOnStartupBytecodePatch.kt | 28 +-- ...niPlayerDimensionsCalculatorFingerprint.kt | 19 +- .../MiniPlayerOverrideFingerprint.kt | 4 +- .../MiniPlayerOverrideNoContextFingerprint.kt | 3 +- ...PlayerResponseModelSizeCheckFingerprint.kt | 10 +- .../patch/TabletMiniPlayerBytecodePatch.kt | 58 +++--- .../WideSearchbarOneFingerprint.kt | 5 +- .../WideSearchbarOneParentFingerprint.kt | 9 +- .../WideSearchbarTwoFingerprint.kt | 4 +- .../WideSearchbarTwoParentFingerprint.kt | 4 +- .../patch/WideSearchbarBytecodePatch.kt | 41 ++-- .../fingerprints/HideWatermarkFingerprint.kt | 12 +- .../HideWatermarkParentFingerprint.kt | 6 +- .../HideChannelWatermarkBytecodePatch.kt | 31 +-- .../fingerprints/SeekbarTappingFingerprint.kt | 35 ++-- .../SeekbarTappingParentFingerprint.kt | 44 +---- .../patch/SeekbarTappingBytecodePatch.kt | 90 ++++----- .../fingerprints/TimeCounterFingerprint.kt | 17 +- .../TimeCounterParentFingerprint.kt | 19 ++ .../patch/HideTimeAndSeekbarBytecodePatch.kt | 42 +++-- .../patch/DoubleBackToClosePatch.kt | 18 +- .../MinimizedPlaybackKidsFingerprint.kt | 8 +- .../MinimizedPlaybackManagerFingerprint.kt | 6 +- .../MinimizedPlaybackSettingsFingerprint.kt | 18 +- .../patch/MinimizedPlaybackBytecodePatch.kt | 3 + .../patch/PiPNotificationBytecodePatch.kt | 6 +- .../UpdatePlayerTypeFingerprint.kt | 32 +--- .../resourceid/patch/SharedResourceIdPatch.kt | 8 + .../fingerprints/DislikeFingerprint.kt | 4 +- .../bytecode/fingerprints/LikeFingerprint.kt | 8 +- .../fingerprints/RemoveLikeFingerprint.kt | 4 +- .../SpeedArrayGeneratorFingerprint.kt | 18 +- .../fingerprints/SpeedLimiterFingerprint.kt | 8 +- .../patch/CustomVideoSpeedBytecodePatch.kt | 177 +++++++++--------- .../bytecode/patch/VideoSpeedBytecodePatch.kt | 16 +- 37 files changed, 412 insertions(+), 426 deletions(-) create mode 100644 src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/bytecode/fingerprints/TimeCounterParentFingerprint.kt diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/bytecode/patch/CreateButtonRemoverBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/bytecode/patch/CreateButtonRemoverBytecodePatch.kt index dfd31ca27..a758843af 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/bytecode/patch/CreateButtonRemoverBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/pivotbar/createbutton/bytecode/patch/CreateButtonRemoverBytecodePatch.kt @@ -34,14 +34,14 @@ class CreateButtonRemoverBytecodePatch : BytecodePatch( * Resolve fingerprints */ - PivotBarFingerprint.result?.let { result -> - val startIndex = result.scanResult.patternScanResult!!.startIndex - val pivotBarInstructions = result.mutableMethod.implementation!!.instructions + PivotBarFingerprint.result?.let { + val startIndex = it.scanResult.patternScanResult!!.startIndex + val pivotBarInstructions = it.mutableMethod.implementation!!.instructions createRef = (pivotBarInstructions.elementAt(startIndex) as ReferenceInstruction).reference as DexBackedMethodReference } ?: return PivotBarFingerprint.toErrorResult() - PivotBarCreateButtonViewFingerprint.result?.let { result -> - with (result.mutableMethod){ + PivotBarCreateButtonViewFingerprint.result?.let { + with (it.mutableMethod){ val createButtonInstructions = implementation!!.instructions createButtonInstructions.filter { instruction -> val fieldReference = (instruction as? ReferenceInstruction)?.reference as? DexBackedMethodReference diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/bytecode/fingerprints/UserWasInShortsFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/bytecode/fingerprints/UserWasInShortsFingerprint.kt index dde2205b7..039e006a8 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/bytecode/fingerprints/UserWasInShortsFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/bytecode/fingerprints/UserWasInShortsFingerprint.kt @@ -1,23 +1,20 @@ package app.revanced.patches.youtube.layout.general.startupshortsreset.bytecode.fingerprints import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode -@FuzzyPatternScanMethod(3) object UserWasInShortsFingerprint : MethodFingerprint( - "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), + returnType = "V", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + parameters = listOf("L"), opcodes = listOf( - Opcode.IGET_OBJECT, - Opcode.INVOKE_INTERFACE, - Opcode.MOVE_RESULT_OBJECT, Opcode.CHECK_CAST, Opcode.INVOKE_INTERFACE, - Opcode.MOVE_RESULT, + Opcode.MOVE_RESULT_OBJECT, Opcode.INVOKE_INTERFACE, - Opcode.MOVE_RESULT, + Opcode.MOVE_RESULT ), strings = listOf("Failed to read user_was_in_shorts proto after successful warmup"), ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/bytecode/patch/HideShortsOnStartupBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/bytecode/patch/HideShortsOnStartupBytecodePatch.kt index 1a2efd338..e77103381 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/bytecode/patch/HideShortsOnStartupBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/startupshortsreset/bytecode/patch/HideShortsOnStartupBytecodePatch.kt @@ -11,7 +11,9 @@ import app.revanced.patcher.patch.PatchResultSuccess import app.revanced.patcher.util.smali.ExternalLabel import app.revanced.patches.youtube.layout.general.startupshortsreset.bytecode.fingerprints.UserWasInShortsFingerprint import app.revanced.shared.annotation.YouTubeCompatibility +import app.revanced.shared.extensions.toErrorResult import app.revanced.shared.util.integrations.Constants.GENERAL_LAYOUT +import org.jf.dexlib2.iface.instruction.OneRegisterInstruction @Name("hide-startup-shorts-player-bytecode-patch") @YouTubeCompatibility @@ -22,18 +24,22 @@ class HideShortsOnStartupBytecodePatch : BytecodePatch( ) ) { override fun execute(context: BytecodeContext): PatchResult { - val userWasInShortsResult = UserWasInShortsFingerprint.result!! - val userWasInShortsMethod = userWasInShortsResult.mutableMethod - val moveResultIndex = userWasInShortsResult.scanResult.patternScanResult!!.endIndex - userWasInShortsMethod.addInstructions( - moveResultIndex + 1, """ - invoke-static { }, $GENERAL_LAYOUT->hideStartupShortsPlayer()Z - move-result v5 - if-eqz v5, :show_startup_shorts_player - return-void - """, listOf(ExternalLabel("show_startup_shorts_player", userWasInShortsMethod.instruction(moveResultIndex + 1))) - ) + UserWasInShortsFingerprint.result?.let { + val insertIndex = it.scanResult.patternScanResult!!.endIndex + 1 + + with (it.mutableMethod) { + val register = (instruction(insertIndex - 1) as OneRegisterInstruction).registerA + 2 + addInstructions( + insertIndex, """ + invoke-static { }, $GENERAL_LAYOUT->hideStartupShortsPlayer()Z + move-result v$register + if-eqz v$register, :show_startup_shorts_player + return-void + """, listOf(ExternalLabel("show_startup_shorts_player", instruction(insertIndex))) + ) + } + } ?: return UserWasInShortsFingerprint.toErrorResult() return PatchResultSuccess() } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerDimensionsCalculatorFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerDimensionsCalculatorFingerprint.kt index 266bf7dd7..affe6ac0e 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerDimensionsCalculatorFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerDimensionsCalculatorFingerprint.kt @@ -1,22 +1,19 @@ package app.revanced.patches.youtube.layout.general.tabletminiplayer.bytecode.fingerprints import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint +import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourcdIdPatch import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode +import org.jf.dexlib2.iface.instruction.WideLiteralInstruction -@FuzzyPatternScanMethod(2) // TODO: Find a good threshold value object MiniPlayerDimensionsCalculatorFingerprint : MethodFingerprint( "V", AccessFlags.PUBLIC or AccessFlags.FINAL, - listOf("L"), - listOf( - Opcode.INVOKE_DIRECT, - Opcode.MOVE_RESULT, - Opcode.IF_NEZ, - Opcode.FLOAT_TO_DOUBLE, - Opcode.CONST_WIDE_HIGH16, - Opcode.CMPL_DOUBLE, - ) + customFingerprint = { methodDef -> + methodDef.implementation?.instructions?.any { instruction -> + instruction.opcode.ordinal == Opcode.CONST.ordinal && + (instruction as? WideLiteralInstruction)?.wideLiteral == SharedResourcdIdPatch.floatybarQueueLabelId + } == true + } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerOverrideFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerOverrideFingerprint.kt index f4841d17c..8589afe2d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerOverrideFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerOverrideFingerprint.kt @@ -6,6 +6,8 @@ import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode object MiniPlayerOverrideFingerprint : MethodFingerprint( - "Z", AccessFlags.STATIC or AccessFlags.PUBLIC, + returnType = "Z", + access = AccessFlags.PUBLIC or AccessFlags.STATIC, + parameters = listOf("L"), opcodes = listOf(Opcode.RETURN), // anchor to insert the instruction ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerOverrideNoContextFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerOverrideNoContextFingerprint.kt index 302973df5..3c9bba6d5 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerOverrideNoContextFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerOverrideNoContextFingerprint.kt @@ -6,6 +6,7 @@ import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode object MiniPlayerOverrideNoContextFingerprint : MethodFingerprint( - "Z", AccessFlags.FINAL or AccessFlags.PRIVATE, + returnType = "Z", + access = AccessFlags.PRIVATE or AccessFlags.FINAL, opcodes = listOf(Opcode.RETURN), // anchor to insert the instruction ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerResponseModelSizeCheckFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerResponseModelSizeCheckFingerprint.kt index e95e919a0..61386f496 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerResponseModelSizeCheckFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/fingerprints/MiniPlayerResponseModelSizeCheckFingerprint.kt @@ -6,15 +6,15 @@ import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode object MiniPlayerResponseModelSizeCheckFingerprint : MethodFingerprint( - "L", - AccessFlags.PUBLIC or AccessFlags.FINAL, - listOf("L", "L"), - listOf( + returnType = "L", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + parameters = listOf("L", "L"), + opcodes = listOf( Opcode.RETURN_OBJECT, Opcode.CHECK_CAST, Opcode.CHECK_CAST, Opcode.INVOKE_STATIC, Opcode.MOVE_RESULT, - Opcode.IF_NEZ, + Opcode.IF_NEZ ) ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/patch/TabletMiniPlayerBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/patch/TabletMiniPlayerBytecodePatch.kt index ac8687f8b..69d1ca97c 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/patch/TabletMiniPlayerBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/tabletminiplayer/bytecode/patch/TabletMiniPlayerBytecodePatch.kt @@ -4,21 +4,22 @@ import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Version import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.extensions.addInstructions -import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult 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.util.proxy.mutableTypes.MutableMethod -import app.revanced.patches.youtube.layout.general.tabletminiplayer.bytecode.fingerprints.MiniPlayerDimensionsCalculatorFingerprint -import app.revanced.patches.youtube.layout.general.tabletminiplayer.bytecode.fingerprints.MiniPlayerOverrideFingerprint -import app.revanced.patches.youtube.layout.general.tabletminiplayer.bytecode.fingerprints.MiniPlayerOverrideNoContextFingerprint -import app.revanced.patches.youtube.layout.general.tabletminiplayer.bytecode.fingerprints.MiniPlayerResponseModelSizeCheckFingerprint +import app.revanced.patches.youtube.layout.general.tabletminiplayer.bytecode.fingerprints.* +import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourcdIdPatch import app.revanced.shared.annotation.YouTubeCompatibility +import app.revanced.shared.extensions.toErrorResult import app.revanced.shared.util.integrations.Constants.GENERAL_LAYOUT import org.jf.dexlib2.iface.instruction.OneRegisterInstruction @Name("enable-tablet-miniplayer-bytecode-patch") +@DependsOn([SharedResourcdIdPatch::class]) @YouTubeCompatibility @Version("0.0.1") class TabletMiniPlayerBytecodePatch : BytecodePatch( @@ -28,35 +29,33 @@ class TabletMiniPlayerBytecodePatch : BytecodePatch( ) ) { override fun execute(context: BytecodeContext): PatchResult { - // first resolve the fingerprints via the parent fingerprint - val miniPlayerClass = MiniPlayerDimensionsCalculatorFingerprint.result!!.classDef - /* - * no context parameter method - */ - MiniPlayerOverrideNoContextFingerprint.resolve(context, miniPlayerClass) - val (method, _, parameterRegister) = MiniPlayerOverrideNoContextFingerprint.addProxyCall() - // - 1 means to insert before the return instruction - val secondInsertIndex = method.implementation!!.instructions.size - 1 - method.insertOverride(secondInsertIndex, parameterRegister /** same register used to return **/) + MiniPlayerDimensionsCalculatorFingerprint.result?.let { parentResult -> + // first resolve the fingerprints via the parent fingerprint + val miniPlayerClass = parentResult.classDef - /* - * method with context parameter - */ - MiniPlayerOverrideFingerprint.resolve(context, miniPlayerClass) - val (_, _, _) = MiniPlayerOverrideFingerprint.addProxyCall() - - /* - * size check return value override - */ - val (_, _, _) = MiniPlayerResponseModelSizeCheckFingerprint.addProxyCall() + arrayOf( + MiniPlayerOverrideNoContextFingerprint, + MiniPlayerOverrideFingerprint, + MiniPlayerResponseModelSizeCheckFingerprint + ).map { + it to (it.also { it.resolve(context, miniPlayerClass) }.result ?: return it.toErrorResult()) + }.forEach { (fingerprint, result) -> + if (fingerprint == MiniPlayerOverrideNoContextFingerprint) { + val (method, _, parameterRegister) = result.addProxyCall() + method.insertOverride(method.implementation!!.instructions.size - 1, parameterRegister) + } else { + val (_, _, _) = result.addProxyCall() + } + } + } ?: return MiniPlayerDimensionsCalculatorFingerprint.toErrorResult() return PatchResultSuccess() } // helper methods private companion object { - fun MethodFingerprint.addProxyCall(): Triple { + fun MethodFingerprintResult.addProxyCall(): Triple { val (method, scanIndex, parameterRegister) = this.unwrap() method.insertOverride(scanIndex, parameterRegister) @@ -73,10 +72,9 @@ class TabletMiniPlayerBytecodePatch : BytecodePatch( ) } - fun MethodFingerprint.unwrap(): Triple { - val result = this.result!! - val scanIndex = result.scanResult.patternScanResult!!.endIndex - val method = result.mutableMethod + fun MethodFingerprintResult.unwrap(): Triple { + val scanIndex = this.scanResult.patternScanResult!!.endIndex + val method = this.mutableMethod val instructions = method.implementation!!.instructions val parameterRegister = (instructions[scanIndex] as OneRegisterInstruction).registerA diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarOneFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarOneFingerprint.kt index 34905feec..862e91606 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarOneFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarOneFingerprint.kt @@ -6,7 +6,10 @@ import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode object WideSearchbarOneFingerprint : MethodFingerprint( - "L",AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"), listOf( + returnType = "L", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + parameters = listOf("L", "L"), + opcodes = listOf( Opcode.IF_NEZ, Opcode.SGET_OBJECT, Opcode.IGET_OBJECT, diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarOneParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarOneParentFingerprint.kt index 5b040063a..78f8f6cbf 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarOneParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarOneParentFingerprint.kt @@ -5,6 +5,11 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import org.jf.dexlib2.AccessFlags object WideSearchbarOneParentFingerprint : MethodFingerprint( - "V", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("L"), - strings = listOf("FEhistory", "FEmy_videos", "FEpurchases") + returnType = "V", access = AccessFlags.PRIVATE or AccessFlags.FINAL, + parameters = listOf("L"), + strings = listOf( + "FEhistory", + "FEmy_videos", + "FEpurchases" + ) ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarTwoFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarTwoFingerprint.kt index 91f881fc7..f4d74abae 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarTwoFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarTwoFingerprint.kt @@ -6,7 +6,9 @@ import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode object WideSearchbarTwoFingerprint : MethodFingerprint( - "L", AccessFlags.PUBLIC or AccessFlags.STATIC, opcodes = listOf( + returnType = "L", + access = AccessFlags.PUBLIC or AccessFlags.STATIC, + opcodes = listOf( Opcode.INVOKE_STATIC, Opcode.MOVE_RESULT, Opcode.IF_EQZ, diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarTwoParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarTwoParentFingerprint.kt index ae5bc5d9f..540565202 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarTwoParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/fingerprints/WideSearchbarTwoParentFingerprint.kt @@ -5,8 +5,8 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import org.jf.dexlib2.AccessFlags object WideSearchbarTwoParentFingerprint : MethodFingerprint( - "L", - AccessFlags.PUBLIC or AccessFlags.STATIC, + returnType = "L", + access = AccessFlags.PUBLIC or AccessFlags.STATIC, strings = listOf( "Callback already registered.", "Failed to create SpotlightModeController." diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/patch/WideSearchbarBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/patch/WideSearchbarBytecodePatch.kt index c38b50179..4d40273ea 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/patch/WideSearchbarBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/general/widesearchbar/bytecode/patch/WideSearchbarBytecodePatch.kt @@ -10,11 +10,9 @@ import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.PatchResult import app.revanced.patcher.patch.PatchResultSuccess import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod -import app.revanced.patches.youtube.layout.general.widesearchbar.bytecode.fingerprints.WideSearchbarOneFingerprint -import app.revanced.patches.youtube.layout.general.widesearchbar.bytecode.fingerprints.WideSearchbarOneParentFingerprint -import app.revanced.patches.youtube.layout.general.widesearchbar.bytecode.fingerprints.WideSearchbarTwoFingerprint -import app.revanced.patches.youtube.layout.general.widesearchbar.bytecode.fingerprints.WideSearchbarTwoParentFingerprint +import app.revanced.patches.youtube.layout.general.widesearchbar.bytecode.fingerprints.* import app.revanced.shared.annotation.YouTubeCompatibility +import app.revanced.shared.extensions.toErrorResult import app.revanced.shared.util.integrations.Constants.GENERAL_LAYOUT @Name("enable-wide-searchbar-bytecode-patch") @@ -22,29 +20,28 @@ import app.revanced.shared.util.integrations.Constants.GENERAL_LAYOUT @Version("0.0.1") class WideSearchbarBytecodePatch : BytecodePatch( listOf( - WideSearchbarOneParentFingerprint, WideSearchbarTwoParentFingerprint + WideSearchbarOneParentFingerprint, + WideSearchbarTwoParentFingerprint ) ) { override fun execute(context: BytecodeContext): PatchResult { - WideSearchbarOneFingerprint.resolve(context, WideSearchbarOneParentFingerprint.result!!.classDef) - WideSearchbarTwoFingerprint.resolve(context, WideSearchbarTwoParentFingerprint.result!!.classDef) - val resultOne = WideSearchbarOneFingerprint.result - val targetMethodOne = - context - .toMethodWalker(resultOne!!.method) - .nextMethod(resultOne.scanResult.patternScanResult!!.endIndex, true) - .getMethod() as MutableMethod + arrayOf( + WideSearchbarOneParentFingerprint to WideSearchbarOneFingerprint, + WideSearchbarTwoParentFingerprint to WideSearchbarTwoFingerprint + ).map { (parentFingerprint, fingerprint) -> + parentFingerprint.result?.let { parentResult -> + fingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let { + val targetMethod = + context + .toMethodWalker(it.method) + .nextMethod(it.scanResult.patternScanResult!!.endIndex, true) + .getMethod() as MutableMethod - - val resultTwo = WideSearchbarTwoFingerprint.result - val targetMethodTwo = - context.toMethodWalker(resultTwo!!.method) - .nextMethod(resultTwo.scanResult.patternScanResult!!.startIndex, true) - .getMethod() as MutableMethod - - injectSearchBarHook(targetMethodOne) - injectSearchBarHook(targetMethodTwo) + injectSearchBarHook(targetMethod) + } ?: return fingerprint.toErrorResult() + } ?: return parentFingerprint.toErrorResult() + } return PatchResultSuccess() } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/bytecode/fingerprints/HideWatermarkFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/bytecode/fingerprints/HideWatermarkFingerprint.kt index dad95c3ab..587681d93 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/bytecode/fingerprints/HideWatermarkFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/bytecode/fingerprints/HideWatermarkFingerprint.kt @@ -1,11 +1,17 @@ package app.revanced.patches.youtube.layout.player.watermark.bytecode.fingerprints import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import org.jf.dexlib2.AccessFlags +import org.jf.dexlib2.Opcode -@FuzzyPatternScanMethod(3) object HideWatermarkFingerprint : MethodFingerprint ( - "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L", "L"), null ,null, null + returnType = "V", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + parameters = listOf("L", "L"), + opcodes = listOf( + Opcode.IF_EQZ, + Opcode.IGET_OBJECT, + Opcode.IGET_BOOLEAN + ) ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/bytecode/fingerprints/HideWatermarkParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/bytecode/fingerprints/HideWatermarkParentFingerprint.kt index 81b695eae..588c52a4a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/bytecode/fingerprints/HideWatermarkParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/bytecode/fingerprints/HideWatermarkParentFingerprint.kt @@ -1,11 +1,11 @@ package app.revanced.patches.youtube.layout.player.watermark.bytecode.fingerprints import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import org.jf.dexlib2.AccessFlags -@FuzzyPatternScanMethod(3) object HideWatermarkParentFingerprint : MethodFingerprint ( - "L", AccessFlags.PUBLIC or AccessFlags.FINAL, null, null, listOf("player_overlay_in_video_programming"), null + returnType = "L", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + strings = listOf("player_overlay_in_video_programming") ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/bytecode/patch/HideChannelWatermarkBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/bytecode/patch/HideChannelWatermarkBytecodePatch.kt index a51b35604..af12dc46f 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/bytecode/patch/HideChannelWatermarkBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/player/watermark/bytecode/patch/HideChannelWatermarkBytecodePatch.kt @@ -4,16 +4,18 @@ import app.revanced.patcher.annotation.Name 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.extensions.removeInstruction import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve 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.patches.youtube.layout.player.watermark.bytecode.fingerprints.HideWatermarkFingerprint import app.revanced.patches.youtube.layout.player.watermark.bytecode.fingerprints.HideWatermarkParentFingerprint import app.revanced.shared.annotation.YouTubeCompatibility +import app.revanced.shared.extensions.toErrorResult import app.revanced.shared.util.integrations.Constants.PLAYER_LAYOUT +import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction @Name("hide-channel-watermark-bytecode-patch") @YouTubeCompatibility @@ -24,20 +26,23 @@ class HideChannelWatermarkBytecodePatch : BytecodePatch( ) ) { override fun execute(context: BytecodeContext): PatchResult { - HideWatermarkFingerprint.resolve(context, HideWatermarkParentFingerprint.result!!.classDef) - val result = HideWatermarkFingerprint.result - ?: return PatchResultError("Required parent method could not be found.") - val method = result.mutableMethod - val line = method.implementation!!.instructions.size - 5 + HideWatermarkParentFingerprint.result?.let { parentResult -> + HideWatermarkFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let { + val insertIndex = it.scanResult.patternScanResult!!.endIndex - method.removeInstruction(line) - method.addInstructions( - line, """ - invoke-static {}, $PLAYER_LAYOUT->hideChannelWatermark()Z - move-result p2 - """ - ) + with (it.mutableMethod) { + val register = (instruction(insertIndex) as TwoRegisterInstruction).registerA + removeInstruction(insertIndex) + addInstructions( + insertIndex, """ + invoke-static {}, $PLAYER_LAYOUT->hideChannelWatermark()Z + move-result v$register + """ + ) + } + } ?: return HideWatermarkFingerprint.toErrorResult() + } ?: return HideWatermarkParentFingerprint.toErrorResult() return PatchResultSuccess() } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/bytecode/fingerprints/SeekbarTappingFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/bytecode/fingerprints/SeekbarTappingFingerprint.kt index bc84b2c29..73cd94302 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/bytecode/fingerprints/SeekbarTappingFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/bytecode/fingerprints/SeekbarTappingFingerprint.kt @@ -1,33 +1,26 @@ package app.revanced.patches.youtube.layout.seekbar.seekbartapping.bytecode.fingerprints import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode +import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction -@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value. object SeekbarTappingFingerprint : MethodFingerprint( - "Z", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("L"), listOf( - Opcode.INVOKE_VIRTUAL, - Opcode.MOVE_RESULT_WIDE, - Opcode.IGET, - Opcode.IGET_OBJECT, - Opcode.IGET, - Opcode.DIV_INT_2ADDR, - Opcode.ADD_INT, - Opcode.SUB_INT_2ADDR, - Opcode.INT_TO_FLOAT, - Opcode.CMPG_FLOAT, - Opcode.IF_GTZ, - Opcode.INT_TO_FLOAT, - Opcode.CMPG_FLOAT, - Opcode.IF_GTZ, - Opcode.CONST_4, - Opcode.INVOKE_INTERFACE, + returnType = "Z", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + parameters = listOf("L"), + opcodes = listOf( Opcode.NEW_INSTANCE, Opcode.INVOKE_DIRECT, Opcode.IPUT_OBJECT, - Opcode.INVOKE_VIRTUAL - ) + Opcode.INVOKE_VIRTUAL, + Opcode.RETURN + ), + customFingerprint = { methodDef -> + methodDef.name == "onTouchEvent" + && methodDef.implementation!!.instructions.any { + ((it as? NarrowLiteralInstruction)?.narrowLiteral == 2147483647) + } + } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/bytecode/fingerprints/SeekbarTappingParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/bytecode/fingerprints/SeekbarTappingParentFingerprint.kt index 1c5003602..8aa73e4bc 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/bytecode/fingerprints/SeekbarTappingParentFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/bytecode/fingerprints/SeekbarTappingParentFingerprint.kt @@ -1,43 +1,19 @@ package app.revanced.patches.youtube.layout.seekbar.seekbartapping.bytecode.fingerprints import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint +import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourcdIdPatch import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode +import org.jf.dexlib2.iface.instruction.WideLiteralInstruction -@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value. object SeekbarTappingParentFingerprint : MethodFingerprint( - "L", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf( - Opcode.INVOKE_VIRTUAL, - Opcode.MOVE_RESULT_OBJECT, - Opcode.INVOKE_VIRTUAL, - Opcode.MOVE_RESULT_OBJECT, - Opcode.CONST_4, - Opcode.NEW_ARRAY, - Opcode.INVOKE_VIRTUAL, - Opcode.MOVE_RESULT_OBJECT, - Opcode.INVOKE_VIRTUAL, - Opcode.MOVE_RESULT_WIDE, - Opcode.INVOKE_STATIC, - Opcode.MOVE_RESULT_OBJECT, - Opcode.INVOKE_STATIC, - Opcode.MOVE_RESULT_OBJECT, - Opcode.CONST_4, - Opcode.APUT_OBJECT, - Opcode.INVOKE_VIRTUAL, - Opcode.MOVE_RESULT_OBJECT, - Opcode.INVOKE_VIRTUAL, - Opcode.MOVE_RESULT_WIDE, - Opcode.INVOKE_STATIC, - Opcode.MOVE_RESULT_OBJECT, - Opcode.INVOKE_STATIC, - Opcode.MOVE_RESULT_OBJECT, - Opcode.CONST_4, - Opcode.APUT_OBJECT, - Opcode.CONST, - Opcode.INVOKE_VIRTUAL, - Opcode.MOVE_RESULT_OBJECT, - Opcode.RETURN_OBJECT - ) + returnType = "L", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + customFingerprint = { methodDef -> + methodDef.implementation?.instructions?.any { instruction -> + instruction.opcode.ordinal == Opcode.CONST.ordinal && + (instruction as? WideLiteralInstruction)?.wideLiteral == SharedResourcdIdPatch.accessibilityProgressTimeLabelId + } == true + } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/bytecode/patch/SeekbarTappingBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/bytecode/patch/SeekbarTappingBytecodePatch.kt index 4594db9be..a0007d6ab 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/bytecode/patch/SeekbarTappingBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/seekbartapping/bytecode/patch/SeekbarTappingBytecodePatch.kt @@ -4,21 +4,25 @@ import app.revanced.patcher.annotation.Name 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.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.util.smali.ExternalLabel import app.revanced.patches.youtube.layout.seekbar.seekbartapping.bytecode.fingerprints.SeekbarTappingFingerprint import app.revanced.patches.youtube.layout.seekbar.seekbartapping.bytecode.fingerprints.SeekbarTappingParentFingerprint +import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourcdIdPatch import app.revanced.shared.annotation.YouTubeCompatibility +import app.revanced.shared.extensions.toErrorResult import app.revanced.shared.util.integrations.Constants.SEEKBAR_LAYOUT import org.jf.dexlib2.Opcode -import org.jf.dexlib2.builder.instruction.BuilderInstruction21t import org.jf.dexlib2.iface.Method import org.jf.dexlib2.iface.instruction.formats.Instruction11n import org.jf.dexlib2.iface.instruction.formats.Instruction35c @Name("enable-seekbar-tapping-bytecode-patch") +@DependsOn([SharedResourcdIdPatch::class]) @YouTubeCompatibility @Version("0.0.1") class SeekbarTappingBytecodePatch : BytecodePatch( @@ -27,65 +31,51 @@ class SeekbarTappingBytecodePatch : BytecodePatch( ) ) { override fun execute(context: BytecodeContext): PatchResult { - var result = SeekbarTappingParentFingerprint.result!! - val tapSeekMethods = mutableMapOf() - // find the methods which tap the seekbar - for (it in result.classDef.methods) { - if (it.implementation == null) continue + SeekbarTappingParentFingerprint.result?.let { parentResult -> + for (it in parentResult.classDef.methods) { + if (it.implementation == null) continue - val instructions = it.implementation!!.instructions - // here we make sure we actually find the method because it has more than 7 instructions - if (instructions.count() < 7) continue + val instructions = it.implementation!!.instructions + // here we make sure we actually find the method because it has more than 7 instructions + if (instructions.count() < 7) continue - // we know that the 7th instruction has the opcode CONST_4 - val instruction = instructions.elementAt(6) - if (instruction.opcode != Opcode.CONST_4) continue + // we know that the 7th instruction has the opcode CONST_4 + val instruction = instructions.elementAt(6) + if (instruction.opcode != Opcode.CONST_4) continue - // the literal for this instruction has to be either 1 or 2 - val literal = (instruction as Instruction11n).narrowLiteral + // the literal for this instruction has to be either 1 or 2 + val literal = (instruction as Instruction11n).narrowLiteral - // method founds - if (literal == 1) tapSeekMethods["P"] = it - if (literal == 2) tapSeekMethods["O"] = it - } + // method founds + if (literal == 1) tapSeekMethods["P"] = it + if (literal == 2) tapSeekMethods["O"] = it + } + } ?: return SeekbarTappingParentFingerprint.toErrorResult() - // replace map because we don't need the upper one anymore - result = SeekbarTappingFingerprint.result!! + SeekbarTappingFingerprint.result?.let { + val insertIndex = it.scanResult.patternScanResult!!.endIndex - val implementation = result.mutableMethod.implementation!! + with (it.mutableMethod) { + val instructions = implementation!!.instructions + val register = (instructions[insertIndex - 1] as Instruction35c).registerC - // if tap-seeking is enabled, do not invoke the two methods below - val pMethod = tapSeekMethods["P"]!! - val oMethod = tapSeekMethods["O"]!! + val pMethod = tapSeekMethods["P"]!! + val oMethod = tapSeekMethods["O"]!! - val insertIndex = result.scanResult.patternScanResult!!.endIndex + 1 + addInstructions( + insertIndex, """ + invoke-static {}, $SEEKBAR_LAYOUT->enableSeekbarTapping()Z + move-result v0 + if-eqz v0, :off + invoke-virtual { v$register, v2 }, ${oMethod.definingClass}->${oMethod.name}(I)V + invoke-virtual { v$register, v2 }, ${pMethod.definingClass}->${pMethod.name}(I)V + """, listOf(ExternalLabel("off", instruction(insertIndex))) + ) + } + } ?: return SeekbarTappingFingerprint.toErrorResult() - // get the required register - val instruction = implementation.instructions[insertIndex - 1] - if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return PatchResultError("Could not find the correct register") - val register = (instruction as Instruction35c).registerC - - val elseLabel = implementation.newLabelForIndex(insertIndex) - // the instructions are written in reverse order. - result.mutableMethod.addInstructions( - insertIndex, """ - invoke-virtual { v$register, v2 }, ${oMethod.definingClass}->${oMethod.name}(I)V - invoke-virtual { v$register, v2 }, ${pMethod.definingClass}->${pMethod.name}(I)V - """ - ) - - // if tap-seeking is disabled, do not invoke the two methods above by jumping to the else label - implementation.addInstruction( - insertIndex, BuilderInstruction21t(Opcode.IF_EQZ, 0, elseLabel) - ) - result.mutableMethod.addInstructions( - insertIndex, """ - invoke-static { }, $SEEKBAR_LAYOUT->enableSeekbarTapping()Z - move-result v0 - """ - ) return PatchResultSuccess() } } \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/bytecode/fingerprints/TimeCounterFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/bytecode/fingerprints/TimeCounterFingerprint.kt index 072c617f1..8bfc6835d 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/bytecode/fingerprints/TimeCounterFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/bytecode/fingerprints/TimeCounterFingerprint.kt @@ -1,24 +1,15 @@ package app.revanced.patches.youtube.layout.seekbar.timeandseekbar.bytecode.fingerprints import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode -@FuzzyPatternScanMethod(3) object TimeCounterFingerprint : MethodFingerprint( - "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf(), listOf( - Opcode.IGET_OBJECT, - Opcode.IGET_WIDE, + returnType = "V", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + opcodes = listOf( Opcode.CONST_WIDE_16, - Opcode.CMP_LONG, - Opcode.IF_LEZ, - Opcode.IGET_OBJECT, - Opcode.IF_EQZ, - Opcode.INVOKE_VIRTUAL, - Opcode.MOVE_RESULT, - Opcode.IF_EQZ, - Opcode.GOTO, + Opcode.CMP_LONG ) ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/bytecode/fingerprints/TimeCounterParentFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/bytecode/fingerprints/TimeCounterParentFingerprint.kt new file mode 100644 index 000000000..5ac1e5730 --- /dev/null +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/bytecode/fingerprints/TimeCounterParentFingerprint.kt @@ -0,0 +1,19 @@ +package app.revanced.patches.youtube.layout.seekbar.timeandseekbar.bytecode.fingerprints + +import app.revanced.patcher.extensions.or +import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint +import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourcdIdPatch +import org.jf.dexlib2.AccessFlags +import org.jf.dexlib2.Opcode +import org.jf.dexlib2.iface.instruction.WideLiteralInstruction + +object TimeCounterParentFingerprint : MethodFingerprint( + returnType = "V", + access = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, + customFingerprint = { methodDef -> + methodDef.implementation?.instructions?.any { instruction -> + instruction.opcode.ordinal == Opcode.CONST.ordinal && + (instruction as? WideLiteralInstruction)?.wideLiteral == SharedResourcdIdPatch.timebarColorLabelId + } == true + } +) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/bytecode/patch/HideTimeAndSeekbarBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/bytecode/patch/HideTimeAndSeekbarBytecodePatch.kt index 673e7fa40..766172cd0 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/bytecode/patch/HideTimeAndSeekbarBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/timeandseekbar/bytecode/patch/HideTimeAndSeekbarBytecodePatch.kt @@ -5,42 +5,50 @@ 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.fingerprint.method.impl.MethodFingerprint.Companion.resolve 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.util.smali.ExternalLabel import app.revanced.patches.youtube.layout.seekbar.timeandseekbar.bytecode.fingerprints.TimeCounterFingerprint +import app.revanced.patches.youtube.layout.seekbar.timeandseekbar.bytecode.fingerprints.TimeCounterParentFingerprint +import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourcdIdPatch import app.revanced.shared.annotation.YouTubeCompatibility +import app.revanced.shared.extensions.toErrorResult import app.revanced.shared.patches.timebar.HookTimebarPatch import app.revanced.shared.util.integrations.Constants.SEEKBAR_LAYOUT -@DependsOn([HookTimebarPatch::class]) +@DependsOn([HookTimebarPatch::class, SharedResourcdIdPatch::class]) @Name("hide-time-and-seekbar-bytecode-patch") @YouTubeCompatibility @Version("0.0.1") class HideTimeAndSeekbarBytecodePatch : BytecodePatch( listOf( - TimeCounterFingerprint + TimeCounterParentFingerprint ) ) { override fun execute(context: BytecodeContext): PatchResult { - listOf( - HookTimebarPatch.SetTimbarFingerprintResult, - TimeCounterFingerprint.result!! - ).forEach { result -> - val method = result.mutableMethod - method.addInstructions( - 0, """ - const/4 v0, 0x0 - invoke-static { }, $SEEKBAR_LAYOUT->hideTimeAndSeekbar()Z - move-result v0 - if-eqz v0, :hide_time_and_seekbar - return-void - """, listOf(ExternalLabel("hide_time_and_seekbar", method.instruction(0))) - ) - } + TimeCounterParentFingerprint.result?.let { parentResult -> + TimeCounterFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let { counterResult -> + listOf( + HookTimebarPatch.SetTimbarFingerprintResult, + counterResult + ).forEach { + val method = it.mutableMethod + method.addInstructions( + 0, """ + invoke-static {}, $SEEKBAR_LAYOUT->hideTimeAndSeekbar()Z + move-result v0 + if-eqz v0, :hide_time_and_seekbar + return-void + """, listOf(ExternalLabel("hide_time_and_seekbar", method.instruction(0))) + ) + } + + } ?: return TimeCounterFingerprint.toErrorResult() + } ?: return TimeCounterParentFingerprint.toErrorResult() return PatchResultSuccess() } diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/doublebacktoclose/patch/DoubleBackToClosePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/doublebacktoclose/patch/DoubleBackToClosePatch.kt index 5a324bef7..d4c8cf929 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/doublebacktoclose/patch/DoubleBackToClosePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/doublebacktoclose/patch/DoubleBackToClosePatch.kt @@ -36,10 +36,10 @@ class DoubleBackToClosePatch : BytecodePatch( /* Hook onBackPressed method inside WatchWhileActivity */ - OnBackPressedFingerprint.result?.let { result -> - val insertIndex = result.scanResult.patternScanResult!!.endIndex + OnBackPressedFingerprint.result?.let { + val insertIndex = it.scanResult.patternScanResult!!.endIndex - with(result.mutableMethod) { + with(it.mutableMethod) { addInstruction( insertIndex, "invoke-static {p0}, $INTEGRATIONS_CLASS_DESCRIPTOR" + @@ -53,9 +53,9 @@ class DoubleBackToClosePatch : BytecodePatch( /* Inject the methods which start of ScrollView */ - ScrollPositionFingerprint.result?.let { result -> - val insertMethod = context.toMethodWalker(result.method) - .nextMethod(result.scanResult.patternScanResult!!.startIndex + 1, true) + ScrollPositionFingerprint.result?.let { + val insertMethod = context.toMethodWalker(it.method) + .nextMethod(it.scanResult.patternScanResult!!.startIndex + 1, true) .getMethod() as MutableMethod val insertIndex = insertMethod.implementation!!.instructions.size - 1 - 1 @@ -68,9 +68,9 @@ class DoubleBackToClosePatch : BytecodePatch( Inject the methods which stop of ScrollView */ ScrollTopParentFingerprint.result?.let { parentResult -> - ScrollTopFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let { result -> - val insertMethod = result.mutableMethod - val insertIndex = result.scanResult.patternScanResult!!.endIndex + ScrollTopFingerprint.also { it.resolve(context, parentResult.classDef) }.result?.let { + val insertMethod = it.mutableMethod + val insertIndex = it.scanResult.patternScanResult!!.endIndex injectScrollView(insertMethod, insertIndex, "onStopScrollView") } ?: return ScrollTopFingerprint.toErrorResult() diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/fingerprints/MinimizedPlaybackKidsFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/fingerprints/MinimizedPlaybackKidsFingerprint.kt index 694576756..9df8947ba 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/fingerprints/MinimizedPlaybackKidsFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/fingerprints/MinimizedPlaybackKidsFingerprint.kt @@ -6,10 +6,10 @@ import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode object MinimizedPlaybackKidsFingerprint : MethodFingerprint( - "V", - AccessFlags.PUBLIC or AccessFlags.FINAL, - listOf("I", "L", "L"), - listOf( + returnType = "V", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + parameters = listOf("I", "L", "L"), + opcodes = listOf( Opcode.IF_EQZ, Opcode.SGET_OBJECT, Opcode.IF_NE, diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/fingerprints/MinimizedPlaybackManagerFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/fingerprints/MinimizedPlaybackManagerFingerprint.kt index 3d0958b57..54b55a2c6 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/fingerprints/MinimizedPlaybackManagerFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/fingerprints/MinimizedPlaybackManagerFingerprint.kt @@ -7,8 +7,10 @@ import org.jf.dexlib2.Opcode import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction object MinimizedPlaybackManagerFingerprint : MethodFingerprint( - "Z", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), - listOf(Opcode.AND_INT_LIT16), + returnType = "Z", + access = AccessFlags.PUBLIC or AccessFlags.STATIC, + parameters = listOf("L"), + opcodes = listOf(Opcode.AND_INT_LIT16), customFingerprint = { methodDef -> methodDef.implementation!!.instructions.any { ((it as? NarrowLiteralInstruction)?.narrowLiteral == 64657230) diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/fingerprints/MinimizedPlaybackSettingsFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/fingerprints/MinimizedPlaybackSettingsFingerprint.kt index f6665d5b9..165928914 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/fingerprints/MinimizedPlaybackSettingsFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/fingerprints/MinimizedPlaybackSettingsFingerprint.kt @@ -1,15 +1,15 @@ package app.revanced.patches.youtube.misc.minimizedplayback.bytecode.fingerprints import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint +import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourcdIdPatch +import org.jf.dexlib2.iface.instruction.WideLiteralInstruction import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode -@FuzzyPatternScanMethod(2) object MinimizedPlaybackSettingsFingerprint : MethodFingerprint( - "L", - AccessFlags.PUBLIC or AccessFlags.FINAL, + returnType = "L", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, opcodes = listOf( Opcode.INVOKE_VIRTUAL, Opcode.MOVE_RESULT, @@ -17,8 +17,12 @@ object MinimizedPlaybackSettingsFingerprint : MethodFingerprint( Opcode.MOVE_RESULT, Opcode.IF_EQZ, Opcode.IF_NEZ, - Opcode.GOTO, - Opcode.IGET_OBJECT, - Opcode.CHECK_CAST + Opcode.GOTO ), + customFingerprint = { methodDef -> + methodDef.implementation?.instructions?.any { instruction -> + instruction.opcode.ordinal == Opcode.CONST.ordinal && + (instruction as? WideLiteralInstruction)?.wideLiteral == SharedResourcdIdPatch.backgroundCategoryLabelId + } == true + } ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/patch/MinimizedPlaybackBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/patch/MinimizedPlaybackBytecodePatch.kt index be65f7ba3..5b6d79674 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/patch/MinimizedPlaybackBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/bytecode/patch/MinimizedPlaybackBytecodePatch.kt @@ -9,15 +9,18 @@ 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.util.proxy.mutableTypes.MutableMethod import app.revanced.patcher.util.smali.ExternalLabel import app.revanced.patches.youtube.misc.minimizedplayback.bytecode.fingerprints.* +import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourcdIdPatch import app.revanced.shared.annotation.YouTubeCompatibility import app.revanced.shared.util.integrations.Constants.MISC_PATH import org.jf.dexlib2.iface.instruction.ReferenceInstruction import org.jf.dexlib2.iface.reference.MethodReference @Name("enable-minimized-playback-bytecode-patch") +@DependsOn([SharedResourcdIdPatch::class]) @YouTubeCompatibility @Version("0.0.1") class MinimizedPlaybackBytecodePatch : BytecodePatch( diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/pipnotification/bytecode/patch/PiPNotificationBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/pipnotification/bytecode/patch/PiPNotificationBytecodePatch.kt index 77288e582..affea76b5 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/pipnotification/bytecode/patch/PiPNotificationBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/pipnotification/bytecode/patch/PiPNotificationBytecodePatch.kt @@ -27,9 +27,9 @@ class PiPNotificationBytecodePatch : BytecodePatch( SecondaryPiPFingerprint ).map { it.result ?: return it.toErrorResult() - }.forEach { result -> - val index = result.scanResult.patternScanResult!!.startIndex + 1 - result.mutableMethod.addInstruction(index, "return-void") + }.forEach { + val index = it.scanResult.patternScanResult!!.startIndex + 1 + it.mutableMethod.addInstruction(index, "return-void") } return PatchResultSuccess() diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/fingerprint/UpdatePlayerTypeFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/fingerprint/UpdatePlayerTypeFingerprint.kt index aa08ea5ab..7da13b6d1 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/fingerprint/UpdatePlayerTypeFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/playertype/fingerprint/UpdatePlayerTypeFingerprint.kt @@ -1,35 +1,19 @@ package app.revanced.patches.youtube.misc.playertype.fingerprint import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode -//TODO constrain to only match in YoutubePlayerOverlaysLayout? -@FuzzyPatternScanMethod(2) object UpdatePlayerTypeFingerprint : MethodFingerprint( - "V", - AccessFlags.PUBLIC or AccessFlags.FINAL, - null, - listOf( - Opcode.INVOKE_VIRTUAL, - Opcode.IGET_OBJECT, + returnType = "V", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + parameters = listOf("L"), + opcodes = listOf( Opcode.IF_NE, - Opcode.RETURN_VOID, - Opcode.IPUT_OBJECT, - Opcode.INVOKE_DIRECT, - Opcode.INVOKE_VIRTUAL, - Opcode.INVOKE_VIRTUAL, - Opcode.INVOKE_VIRTUAL, - Opcode.MOVE_RESULT, - Opcode.IF_EQZ, - Opcode.CONST_4, - Opcode.INVOKE_STATIC, - Opcode.RETURN_VOID, - Opcode.CONST_4, - Opcode.INVOKE_STATIC, - Opcode.INVOKE_VIRTUAL, Opcode.RETURN_VOID - ) + ), + customFingerprint = { + it.definingClass.endsWith("YouTubePlayerOverlaysLayout;") + } ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/resourceid/patch/SharedResourceIdPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/resourceid/patch/SharedResourceIdPatch.kt index 1e231130a..27ec8d951 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/resourceid/patch/SharedResourceIdPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/resourceid/patch/SharedResourceIdPatch.kt @@ -17,19 +17,23 @@ import app.revanced.shared.patches.mapping.ResourceMappingPatch class SharedResourcdIdPatch : ResourcePatch { internal companion object { var abclistmenuitemLabelId: Long = -1 + var accessibilityProgressTimeLabelId: Long = -1 var accountSwitcherAccessibilityLabelId: Long = -1 var appearanceStringId: Long = -1 + var backgroundCategoryLabelId: Long = -1 var bottompaneloverlaytextLabelId: Long = -1 var bottomUiContainerResourceId: Long = -1 var controlsLayoutStubResourceId: Long = -1 var educationTextViewResourceId: Long = -1 var emptycolorLabelId: Long = -1 + var floatybarQueueLabelId: Long = -1 var imageOnlyTabId: Long = -1 var imageWithTextTabId: Long = -1 var layoutCircle: Long = -1 var layoutIcon: Long = -1 var layoutVideo: Long = -1 var scrubbingLabelId: Long = -1 + var timebarColorLabelId: Long = -1 var videoqualityfragmentLabelId: Long = -1 } @@ -40,19 +44,23 @@ class SharedResourcdIdPatch : ResourcePatch { .single { it.type == type && it.name == name }.id abclistmenuitemLabelId = findSharedResourceId("layout", "abc_list_menu_item_layout") + accessibilityProgressTimeLabelId = findSharedResourceId("string", "accessibility_player_progress_time") accountSwitcherAccessibilityLabelId = findSharedResourceId("string", "account_switcher_accessibility_label") appearanceStringId = findSharedResourceId("string", "app_theme_appearance_dark") + backgroundCategoryLabelId = findSharedResourceId("string", "pref_background_and_offline_category") bottompaneloverlaytextLabelId = findSharedResourceId("id", "bottom_panel_overlay_text") bottomUiContainerResourceId = findSharedResourceId("id", "bottom_ui_container_stub") controlsLayoutStubResourceId = findSharedResourceId("id", "controls_layout_stub") educationTextViewResourceId = findSharedResourceId("id", "user_education_text_view") emptycolorLabelId = findSharedResourceId("color", "inline_time_bar_colorized_bar_empty_color_dark") + floatybarQueueLabelId = findSharedResourceId("string", "floaty_bar_queue_status") imageOnlyTabId = findSharedResourceId("layout", "image_only_tab") imageWithTextTabId = findSharedResourceId("layout", "image_with_text_tab") layoutCircle = findSharedResourceId("layout", "endscreen_element_layout_circle") layoutIcon = findSharedResourceId("layout", "endscreen_element_layout_icon") layoutVideo = findSharedResourceId("layout", "endscreen_element_layout_video") scrubbingLabelId = findSharedResourceId("dimen", "vertical_touch_offset_to_enter_fine_scrubbing") + timebarColorLabelId = findSharedResourceId("color", "inline_time_bar_progress_color") videoqualityfragmentLabelId = findSharedResourceId("layout", "video_quality_bottom_sheet_list_fragment_title") return PatchResultSuccess() diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/returnyoutubedislike/bytecode/fingerprints/DislikeFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/returnyoutubedislike/bytecode/fingerprints/DislikeFingerprint.kt index ffdbc9465..b36e768fd 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/returnyoutubedislike/bytecode/fingerprints/DislikeFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/returnyoutubedislike/bytecode/fingerprints/DislikeFingerprint.kt @@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import org.jf.dexlib2.AccessFlags object DislikeFingerprint : MethodFingerprint( - "V", - AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR, + returnType = "V", + access = AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR, strings = listOf("like/dislike") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/returnyoutubedislike/bytecode/fingerprints/LikeFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/returnyoutubedislike/bytecode/fingerprints/LikeFingerprint.kt index 3fdb2d649..6714c8258 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/returnyoutubedislike/bytecode/fingerprints/LikeFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/returnyoutubedislike/bytecode/fingerprints/LikeFingerprint.kt @@ -1,13 +1,11 @@ package app.revanced.patches.youtube.misc.returnyoutubedislike.bytecode.fingerprints import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import org.jf.dexlib2.AccessFlags -@FuzzyPatternScanMethod(2) object LikeFingerprint : MethodFingerprint( - "V", - AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR, - strings = listOf("like/like") + returnType = "V", + access = AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR, + strings = listOf("like/like") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/returnyoutubedislike/bytecode/fingerprints/RemoveLikeFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/returnyoutubedislike/bytecode/fingerprints/RemoveLikeFingerprint.kt index 49b8b5587..65abc863a 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/returnyoutubedislike/bytecode/fingerprints/RemoveLikeFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/returnyoutubedislike/bytecode/fingerprints/RemoveLikeFingerprint.kt @@ -5,7 +5,7 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import org.jf.dexlib2.AccessFlags object RemoveLikeFingerprint : MethodFingerprint( - "V", - AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR, + returnType = "V", + access = AccessFlags.PROTECTED or AccessFlags.CONSTRUCTOR, strings = listOf("like/removelike") ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/bytecode/fingerprints/SpeedArrayGeneratorFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/bytecode/fingerprints/SpeedArrayGeneratorFingerprint.kt index 97abdad0e..48fd88602 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/bytecode/fingerprints/SpeedArrayGeneratorFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/bytecode/fingerprints/SpeedArrayGeneratorFingerprint.kt @@ -1,23 +1,11 @@ package app.revanced.patches.youtube.video.customspeed.bytecode.fingerprints import app.revanced.patcher.extensions.or -import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint import org.jf.dexlib2.AccessFlags -import org.jf.dexlib2.Opcode -@FuzzyPatternScanMethod(2) object SpeedArrayGeneratorFingerprint : MethodFingerprint( - "[L", - AccessFlags.PUBLIC or AccessFlags.STATIC, - null, - listOf( - Opcode.IF_NEZ, - Opcode.SGET_OBJECT, - Opcode.GOTO, - Opcode.INVOKE_INTERFACE, - Opcode.MOVE_RESULT_OBJECT, - Opcode.IGET_OBJECT, - ), - listOf("0.0#") + returnType = "[L", + access = AccessFlags.PUBLIC or AccessFlags.STATIC, + strings = listOf("0.0#") ) diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/bytecode/fingerprints/SpeedLimiterFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/bytecode/fingerprints/SpeedLimiterFingerprint.kt index 0d2901873..3ba4eba29 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/bytecode/fingerprints/SpeedLimiterFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/bytecode/fingerprints/SpeedLimiterFingerprint.kt @@ -6,10 +6,10 @@ import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode object SpeedLimiterFingerprint : MethodFingerprint( - "V", - AccessFlags.PUBLIC or AccessFlags.FINAL, - listOf("F"), - listOf( + returnType = "V", + access = AccessFlags.PUBLIC or AccessFlags.FINAL, + parameters = listOf("F"), + opcodes = listOf( Opcode.INVOKE_STATIC, Opcode.MOVE_RESULT, Opcode.IF_EQZ, diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/bytecode/patch/CustomVideoSpeedBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/bytecode/patch/CustomVideoSpeedBytecodePatch.kt index a4b14d4d1..b8e8b9f92 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/bytecode/patch/CustomVideoSpeedBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/video/customspeed/bytecode/patch/CustomVideoSpeedBytecodePatch.kt @@ -6,14 +6,15 @@ import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.extensions.addInstructions import app.revanced.patcher.extensions.instruction import app.revanced.patcher.extensions.replaceInstruction -import app.revanced.patcher.patch.annotations.DependsOn 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.util.smali.ExternalLabel import app.revanced.patches.youtube.video.customspeed.bytecode.fingerprints.* import app.revanced.shared.annotation.YouTubeCompatibility +import app.revanced.shared.extensions.toErrorResult import app.revanced.shared.patches.options.PatchOptions import app.revanced.shared.util.integrations.Constants.VIDEO_PATH import org.jf.dexlib2.builder.instruction.BuilderArrayPayload @@ -34,117 +35,119 @@ class CustomVideoSpeedBytecodePatch : BytecodePatch( VideoSpeedEntriesFingerprint ) ) { - private companion object { - const val INTEGRATIONS_VIDEO_SPEED_CLASS_DESCRIPTOR = - "$VIDEO_PATH/VideoSpeedPatch;" - - const val INTEGRATIONS_VIDEO_SPEED_ENTRIES_CLASS_DESCRIPTOR = - "$VIDEO_PATH/VideoSpeedEntries;" - } override fun execute(context: BytecodeContext): PatchResult { val speed = PatchOptions.CustomSpeedArrays val splits = speed!!.replace(" ","").split(",") if (splits.isEmpty()) throw IllegalArgumentException("Invalid speed elements") val videoSpeedsArray = splits.map { it.toFloat().toRawBits() } - val arrayGenMethod = SpeedArrayGeneratorFingerprint.result?.mutableMethod!! - val arrayGenMethodImpl = arrayGenMethod.implementation!! + SpeedArrayGeneratorFingerprint.result?.let { result -> + with (result.mutableMethod) { + val sizeCallIndex = implementation!!.instructions + .indexOfFirst { ((it as? ReferenceInstruction)?.reference as? MethodReference)?.name == "size" } - val sizeCallIndex = arrayGenMethodImpl.instructions - .indexOfFirst { ((it as? ReferenceInstruction)?.reference as? MethodReference)?.name == "size" } + if (sizeCallIndex == -1) return PatchResultError("Couldn't find call to size()") - if (sizeCallIndex == -1) return PatchResultError("Couldn't find call to size()") + val sizeCallResultRegister = + (implementation!!.instructions.elementAt(sizeCallIndex + 1) as OneRegisterInstruction).registerA - val sizeCallResultRegister = - (arrayGenMethodImpl.instructions.elementAt(sizeCallIndex + 1) as OneRegisterInstruction).registerA + addInstructions( + sizeCallIndex + 2, + """ + invoke-static {}, $INTEGRATIONS_VIDEO_SPEED_CLASS_DESCRIPTOR->isCustomVideoSpeedEnabled()Z + move-result v9 + if-eqz v9, :defaultspeed + const/4 v$sizeCallResultRegister, 0x0 + """, listOf(ExternalLabel("defaultspeed", instruction(sizeCallIndex + 2))) + ) - arrayGenMethod.addInstructions( - sizeCallIndex + 2, - """ - invoke-static {}, $INTEGRATIONS_VIDEO_SPEED_CLASS_DESCRIPTOR->isCustomVideoSpeedEnabled()Z - move-result v9 - if-eqz v9, :defaultspeed - const/4 v$sizeCallResultRegister, 0x0 - """, listOf(ExternalLabel("defaultspeed", arrayGenMethod.instruction(sizeCallIndex + 2))) - ) + val (arrayLengthConstIndex, arrayLengthConst) = implementation!!.instructions.withIndex() + .first { (it.value as? NarrowLiteralInstruction)?.narrowLiteral == 7 } + val arrayLengthConstDestination = (arrayLengthConst as OneRegisterInstruction).registerA - val (arrayLengthConstIndex, arrayLengthConst) = arrayGenMethodImpl.instructions.withIndex() - .first { (it.value as? NarrowLiteralInstruction)?.narrowLiteral == 7 } + val videoSpeedsArrayType = "$INTEGRATIONS_VIDEO_SPEED_ENTRIES_CLASS_DESCRIPTOR->videoSpeed:[F" - val arrayLengthConstDestination = (arrayLengthConst as OneRegisterInstruction).registerA + addInstructions( + arrayLengthConstIndex + 1, + """ + if-eqz v9, :defaultspeed + sget-object v$arrayLengthConstDestination, $videoSpeedsArrayType + array-length v$arrayLengthConstDestination, v$arrayLengthConstDestination + """, listOf(ExternalLabel("defaultspeed", instruction(arrayLengthConstIndex + 1))) + ) - val videoSpeedsArrayType = "$INTEGRATIONS_VIDEO_SPEED_ENTRIES_CLASS_DESCRIPTOR->videoSpeed:[F" + val (originalArrayFetchIndex, originalArrayFetch) = implementation!!.instructions.withIndex() + .first { + val reference = ((it.value as? ReferenceInstruction)?.reference as? FieldReference) + reference?.definingClass?.contains("PlayerConfigModel") ?: false && + reference?.type == "[F" + } - arrayGenMethod.addInstructions( - arrayLengthConstIndex + 1, - """ - if-eqz v9, :defaultspeed - sget-object v$arrayLengthConstDestination, $videoSpeedsArrayType - array-length v$arrayLengthConstDestination, v$arrayLengthConstDestination - """, listOf(ExternalLabel("defaultspeed", arrayGenMethod.instruction(arrayLengthConstIndex + 1))) - ) + val originalArrayFetchDestination = (originalArrayFetch as OneRegisterInstruction).registerA - val (originalArrayFetchIndex, originalArrayFetch) = arrayGenMethodImpl.instructions.withIndex() - .first { - val reference = ((it.value as? ReferenceInstruction)?.reference as? FieldReference) - reference?.definingClass?.contains("PlayerConfigModel") ?: false && - reference?.type == "[F" + addInstructions( + originalArrayFetchIndex + 1, + """ + if-eqz v9, :defaultspeed + sget-object v$originalArrayFetchDestination, $videoSpeedsArrayType + """, listOf(ExternalLabel("defaultspeed", instruction(originalArrayFetchIndex + 1))) + ) } + } ?: return SpeedArrayGeneratorFingerprint.toErrorResult() - val originalArrayFetchDestination = (originalArrayFetch as OneRegisterInstruction).registerA + SpeedLimiterFingerprint.result?.let { result -> + with (result.mutableMethod) { + val (limiterMinConstIndex, limiterMinConst) = implementation!!.instructions.withIndex() + .first { (it.value as? NarrowLiteralInstruction)?.narrowLiteral == 0.25f.toRawBits() } + val (limiterMaxConstIndex, limiterMaxConst) = implementation!!.instructions.withIndex() + .first { (it.value as? NarrowLiteralInstruction)?.narrowLiteral == 2.0f.toRawBits() } - arrayGenMethod.addInstructions( - originalArrayFetchIndex + 1, - """ - if-eqz v9, :defaultspeed - sget-object v$originalArrayFetchDestination, $videoSpeedsArrayType - """, listOf(ExternalLabel("defaultspeed", arrayGenMethod.instruction(originalArrayFetchIndex + 1))) - ) + val limiterMinConstDestination = (limiterMinConst as OneRegisterInstruction).registerA + val limiterMaxConstDestination = (limiterMaxConst as OneRegisterInstruction).registerA - val limiterMethod = SpeedLimiterFingerprint.result?.mutableMethod!!; - val limiterMethodImpl = limiterMethod.implementation!! + fun hexFloat(float: Float): String = "0x%08x".format(float.toRawBits()) - val speedLimitMin = 0.0f - val speedLimitMax = 100f + replaceInstruction( + limiterMinConstIndex, + "const/high16 v$limiterMinConstDestination, ${hexFloat(speedLimitMin)}" + ) + replaceInstruction( + limiterMaxConstIndex, + "const/high16 v$limiterMaxConstDestination, ${hexFloat(speedLimitMax)}" + ) + } + } ?: return SpeedLimiterFingerprint.toErrorResult() - val (limiterMinConstIndex, limiterMinConst) = limiterMethodImpl.instructions.withIndex() - .first { (it.value as? NarrowLiteralInstruction)?.narrowLiteral == 0.25f.toRawBits() } - val (limiterMaxConstIndex, limiterMaxConst) = limiterMethodImpl.instructions.withIndex() - .first { (it.value as? NarrowLiteralInstruction)?.narrowLiteral == 2.0f.toRawBits() } + VideoSpeedEntriesFingerprint.result?.let { + with (it.mutableMethod) { + val arrayPayloadIndex = implementation!!.instructions.size - 1 - val limiterMinConstDestination = (limiterMinConst as OneRegisterInstruction).registerA - val limiterMaxConstDestination = (limiterMaxConst as OneRegisterInstruction).registerA + replaceInstruction( + 0, + "const/16 v0, ${videoSpeedsArray.size}" + ) - fun hexFloat(float: Float): String = "0x%08x".format(float.toRawBits()) - - limiterMethod.replaceInstruction( - limiterMinConstIndex, - "const/high16 v$limiterMinConstDestination, ${hexFloat(speedLimitMin)}" - ) - limiterMethod.replaceInstruction( - limiterMaxConstIndex, - "const/high16 v$limiterMaxConstDestination, ${hexFloat(speedLimitMax)}" - ) - - val constructorResult = VideoSpeedEntriesFingerprint.result!! - val constructor = constructorResult.mutableMethod - val implementation = constructor.implementation!! - - constructor.replaceInstruction( - 0, - "const/16 v0, ${videoSpeedsArray.size}" - ) - - val arrayPayloadIndex = implementation.instructions.size - 1 - implementation.replaceInstruction( - arrayPayloadIndex, - BuilderArrayPayload( - 4, - videoSpeedsArray - ) - ) + implementation!!.replaceInstruction( + arrayPayloadIndex, + BuilderArrayPayload( + 4, + videoSpeedsArray + ) + ) + } + } ?: return VideoSpeedEntriesFingerprint.toErrorResult() return PatchResultSuccess() } + companion object { + const val INTEGRATIONS_VIDEO_SPEED_CLASS_DESCRIPTOR = + "$VIDEO_PATH/VideoSpeedPatch;" + + const val INTEGRATIONS_VIDEO_SPEED_ENTRIES_CLASS_DESCRIPTOR = + "$VIDEO_PATH/VideoSpeedEntries;" + + const val speedLimitMin = 0.0f + const val speedLimitMax = 100f + } } diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/speed/bytecode/patch/VideoSpeedBytecodePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/speed/bytecode/patch/VideoSpeedBytecodePatch.kt index f6d889d4e..fa40ff7b1 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/video/speed/bytecode/patch/VideoSpeedBytecodePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/bytecode/patch/VideoSpeedBytecodePatch.kt @@ -46,11 +46,11 @@ class VideoSpeedBytecodePatch : BytecodePatch( VideoSpeedParentFingerprint.result?.let { parentResult -> val parentClassDef = parentResult.classDef - VideoSpeedChangedFingerprint.also { it.resolve(context, parentClassDef) }.result?.let { result -> - startIndex = result.scanResult.patternScanResult!!.startIndex - endIndex = result.scanResult.patternScanResult!!.endIndex + VideoSpeedChangedFingerprint.also { it.resolve(context, parentClassDef) }.result?.let { + startIndex = it.scanResult.patternScanResult!!.startIndex + endIndex = it.scanResult.patternScanResult!!.endIndex - with (result.method) { + with (it.method) { val speedInstruction = implementation!!.instructions firstRef = @@ -65,7 +65,7 @@ class VideoSpeedBytecodePatch : BytecodePatch( val register = (speedInstruction.elementAt(endIndex) as FiveRegisterInstruction).registerD - result.mutableMethod.addInstruction( + it.mutableMethod.addInstruction( endIndex, "invoke-static { v$register }, $INTEGRATIONS_VIDEO_SPEED_CLASS_DESCRIPTOR" + "->" + @@ -104,12 +104,12 @@ class VideoSpeedBytecodePatch : BytecodePatch( } ?: return VideoSpeedParentFingerprint.toErrorResult() - VideoSpeedSetterFingerprint.result?.let { result -> - result.mutableMethod.addInstructions( + VideoSpeedSetterFingerprint.result?.let { + it.mutableMethod.addInstructions( 0, """ invoke-static {}, $INTEGRATIONS_VIDEO_SPEED_CLASS_DESCRIPTOR->getSpeedValue()F move-result v0 - invoke-direct {p0, v0}, ${result.classDef.type}->overrideSpeed(F)V + invoke-direct {p0, v0}, ${it.classDef.type}->overrideSpeed(F)V """, ) } ?: return VideoSpeedSetterFingerprint.toErrorResult()