fix: breaking changes by revanced-patcher dependency

Signed-off-by: oSumAtrIX <johan.melkonyan1@web.de>
2022-05-22 13:43:41 +02:00
parent 96e7aed843
commit 1748cd98a4
68 changed files with 3692 additions and 3594 deletions
@@ -1,186 +0,0 @@
-package app.revanced.patches.youtube.interaction
-
-import app.revanced.patcher.data.implementation.BytecodeData
-import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.patch.implementation.BytecodePatch
-import app.revanced.patcher.patch.implementation.metadata.PackageMetadata
-import app.revanced.patcher.patch.implementation.metadata.PatchMetadata
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultError
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.signature.MethodMetadata
-import app.revanced.patcher.signature.MethodSignature
-import app.revanced.patcher.signature.MethodSignatureMetadata
-import app.revanced.patcher.signature.PatternScanMethod
-import app.revanced.patcher.smali.toInstructions
-import org.jf.dexlib2.AccessFlags
-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
-
-private val compatiblePackages = listOf(
-    PackageMetadata(
-        "com.google.android.youtube",
-        listOf("17.17.34")
-    )
-)
-
-class EnableSeekbarTappingPatch : BytecodePatch(
-    PatchMetadata(
-        "seekbar-tapping",
-        "Enable seekbar tapping patch",
-        "Enable tapping on the seekbar of the YouTube player.",
-        compatiblePackages,
-        "0.0.1"
-    ),
-    listOf(
-        MethodSignature(
-            MethodSignatureMetadata(
-                "enable-seekbar-tapping-parent-signature",
-                MethodMetadata("Lzhj;", "J"), // unknown
-                PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
-                compatiblePackages,
-                "Signature for a parent method, which is needed to find the actual method required to be patched.",
-                "0.0.1"
-            ),
-            "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
-            )
-        ),
-        MethodSignature(
-            MethodSignatureMetadata(
-                "enable-seekbar-tapping-signature",
-                MethodMetadata("Lfao;", "onTouchEvent"), // unknown
-                PatternScanMethod.Fuzzy(2), // FIXME: Test this threshold and find the best value.
-                compatiblePackages,
-                "Signature for the method required to be patched.",
-                "0.0.1"
-            ),
-            "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,
-                Opcode.NEW_INSTANCE,
-                Opcode.INVOKE_DIRECT,
-                Opcode.IPUT_OBJECT,
-                Opcode.INVOKE_VIRTUAL
-            )
-        )
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        var result = signatures.first().result!!
-
-        val tapSeekMethods = mutableMapOf<String, Method>()
-
-        // find the methods which tap the seekbar
-        for (it in result.definingClassProxy.immutableClass.methods) {
-            if (it.implementation == null) continue
-
-            val instructions = it.implementation!!.instructions
-            // here we make sure we actually find the method because it has more then 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
-
-            // 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
-        }
-
-        // replace map because we dont need the upper one anymore
-        result = signatures.last().result!!
-
-        val implementation = result.method.implementation!!
-
-        // if tap-seeking is enabled, do not invoke the two methods below
-        val pMethod = tapSeekMethods["P"]!!
-        val oMethod = tapSeekMethods["O"]!!
-
-        // get the required register
-        val instruction = implementation.instructions[result.scanData.endIndex]
-        if (instruction.opcode != Opcode.INVOKE_VIRTUAL)
-            return PatchResultError("Could not find the correct register")
-        val register = (instruction as Instruction35c).registerC
-
-        // the instructions are written in reverse order.
-        implementation.addInstructions(
-            result.scanData.endIndex + 1,
-            """
-               invoke-virtual { v$register, v2 }, ${oMethod.definingClass}->${oMethod.name}(I)V
-               invoke-virtual { v$register, v2 }, ${pMethod.definingClass}->${pMethod.name}(I)V
-            """.trimIndent().toInstructions()
-        )
-
-        // if tap-seeking is disabled, do not invoke the two methods above by jumping to the else label
-        val elseLabel = implementation.newLabelForIndex(result.scanData.endIndex + 1)
-        implementation.addInstruction(
-            result.scanData.endIndex + 1,
-            BuilderInstruction21t(Opcode.IF_EQZ, 0, elseLabel)
-        )
-        implementation.addInstructions(
-            result.scanData.endIndex + 1,
-            """
-                invoke-static { }, Lfi/razerman/youtube/preferences/BooleanPreferences;->isTapSeekingEnabled()Z
-                move-result v0
-            """.trimIndent().toInstructions()
-        )
-        return PatchResultSuccess()
-    }
-}
@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.interaction.seekbar.annotation
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.17.34")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class SeekbarTappingCompatibility
+
@@ -0,0 +1,94 @@
+package app.revanced.patches.youtube.interaction.seekbar.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.implementation.misc.PatchResultError
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.util.smali.toInstructions
+import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
+import app.revanced.patches.youtube.interaction.seekbar.signatures.SeekbarTappingParentSignature
+import app.revanced.patches.youtube.interaction.seekbar.signatures.SeekbarTappingSignature
+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
+
+
+@Patch
+@Name("seekbar-tapping")
+@Description("Enable tapping on the seekbar of the YouTube player.")
+@SeekbarTappingCompatibility
+@Version("0.0.1")
+class EnableSeekbarTappingPatch : BytecodePatch(
+    listOf(
+        SeekbarTappingParentSignature, SeekbarTappingSignature
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        var result = signatures.first().result!!
+
+        val tapSeekMethods = mutableMapOf<String, Method>()
+
+        // find the methods which tap the seekbar
+        for (it in result.definingClassProxy.immutableClass.methods) {
+            if (it.implementation == null) continue
+
+            val instructions = it.implementation!!.instructions
+            // here we make sure we actually find the method because it has more then 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
+
+            // 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
+        }
+
+        // replace map because we dont need the upper one anymore
+        result = signatures.last().result!!
+
+        val implementation = result.method.implementation!!
+
+        // if tap-seeking is enabled, do not invoke the two methods below
+        val pMethod = tapSeekMethods["P"]!!
+        val oMethod = tapSeekMethods["O"]!!
+
+        // get the required register
+        val instruction = implementation.instructions[result.scanData.endIndex]
+        if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return PatchResultError("Could not find the correct register")
+        val register = (instruction as Instruction35c).registerC
+
+        // the instructions are written in reverse order.
+        implementation.addInstructions(
+            result.scanData.endIndex + 1, """
+               invoke-virtual { v$register, v2 }, ${oMethod.definingClass}->${oMethod.name}(I)V
+               invoke-virtual { v$register, v2 }, ${pMethod.definingClass}->${pMethod.name}(I)V
+            """.trimIndent().toInstructions()
+        )
+
+        // if tap-seeking is disabled, do not invoke the two methods above by jumping to the else label
+        val elseLabel = implementation.newLabelForIndex(result.scanData.endIndex + 1)
+        implementation.addInstruction(
+            result.scanData.endIndex + 1, BuilderInstruction21t(Opcode.IF_EQZ, 0, elseLabel)
+        )
+        implementation.addInstructions(
+            result.scanData.endIndex + 1, """
+                invoke-static { }, Lfi/razerman/youtube/preferences/BooleanPreferences;->isTapSeekingEnabled()Z
+                move-result v0
+            """.trimIndent().toInstructions()
+        )
+        return PatchResultSuccess()
+    }
+}
@@ -0,0 +1,51 @@
+package app.revanced.patches.youtube.interaction.seekbar.signatures
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("enable-seekbar-tapping-parent")
+@MatchingMethod("Lzhj;", "J")
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@SeekbarTappingCompatibility
+@Version("0.0.1")
+object SeekbarTappingParentSignature : MethodSignature(
+    "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
+    )
+)
@@ -0,0 +1,41 @@
+package app.revanced.patches.youtube.interaction.seekbar.signatures
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
+import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("enable-seekbar-tapping-signature")
+@MatchingMethod("Lfao;", "onTouchEvent")
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@SeekbarTappingCompatibility
+@Version("0.0.1")
+object SeekbarTappingSignature : MethodSignature(
+    "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,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.INVOKE_VIRTUAL
+    )
+)