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
@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.createbutton.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class CreateButtonCompatibility
@@ -0,0 +1,46 @@
+package app.revanced.patches.youtube.layout.createbutton.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.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.toInstruction
+import app.revanced.patches.youtube.layout.createbutton.signatures.CreateButtonSignature
+import app.revanced.patches.youtube.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+
+@Patch
+@Name("disable-create-button")
+@Description("Disable the create button.")
+@MinimizedPlaybackCompatibility
+@Version("0.0.1")
+class CreateButtonRemoverPatch : BytecodePatch(
+    listOf(
+        CreateButtonSignature
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val result = signatures.first().result!!
+
+        // Get the required register which holds the view object we need to pass to the method hideCreateButton
+        val implementation = result.method.implementation!!
+        val instruction = implementation.instructions[result.scanData.endIndex + 1]
+        if (instruction.opcode != Opcode.INVOKE_STATIC)
+            return PatchResultError("Could not find the correct register")
+        val register = (instruction as Instruction35c).registerC
+
+        // Hide the button view via proxy by passing it to the hideCreateButton method
+        implementation.addInstruction(
+            result.scanData.endIndex + 1,
+            "invoke-static { v$register }, Lfi/razerman/youtube/XAdRemover;->hideCreateButton(Landroid/view/View;)V".toInstruction()
+        )
+
+        return PatchResultSuccess()
+    }
+}
@@ -0,0 +1,57 @@
+package app.revanced.patches.youtube.layout.createbutton.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.layout.amoled.annotations.AmoledCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("create-button-signature")
+@MatchingMethod(
+    "Lkne", "z"
+)
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@AmoledCompatibility
+@Version("0.0.1")
+object CreateButtonSignature : MethodSignature(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    listOf("Z"),
+    listOf(
+        Opcode.IGET,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.CONST,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.MOVE_OBJECT,
+        Opcode.MOVE_OBJECT,
+        Opcode.INVOKE_DIRECT_RANGE,
+        Opcode.CONST_4,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+    )
+)