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.reels.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 HideReelsCompatibility
@@ -0,0 +1,38 @@
+package app.revanced.patches.youtube.layout.reels.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.PatchResultSuccess
+import app.revanced.patcher.util.smali.toInstruction
+import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
+import app.revanced.patches.youtube.layout.reels.signatures.HideReelsSignature
+
+@Patch
+@Name("hide-reels")
+@Description("Hide reels on the page.")
+@HideReelsCompatibility
+@Version("0.0.1")
+class HideReelsPatch : BytecodePatch(
+    listOf(
+        HideReelsSignature
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val result = signatures.first().result!!
+        val implementation = result.method.implementation!!
+
+        // HideReel will hide the reel view before it is being used,
+        // so we pass the view to the HideReel method
+        implementation.addInstruction(
+            result.scanData.endIndex,
+            "invoke-static { v2 }, Lfi/razerman/youtube/XAdRemover;->HideReel(Landroid/view/View;)V".toInstruction()
+        )
+
+        return PatchResultSuccess()
+    }
+}
@@ -0,0 +1,58 @@
+package app.revanced.patches.youtube.layout.reels.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.reels.annotations.HideReelsCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("hide-reels-signature")
+@MatchingMethod(
+    "Ljvy", "<init>"
+)
+@FuzzyPatternScanMethod(3) // FIXME: Test this threshold and find the best value.
+@HideReelsCompatibility
+@Version("0.0.1")
+object HideReelsSignature : MethodSignature(
+    "V", AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR, listOf(
+        "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "L", "[B", "[B", "[B", "[B", "[B", "[B"
+    ), listOf(
+        Opcode.MOVE_OBJECT,
+        Opcode.MOVE_OBJECT,
+        Opcode.INVOKE_DIRECT,
+        Opcode.MOVE_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.MOVE_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.MOVE_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.MOVE_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.MOVE_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.MOVE_OBJECT_FROM16,
+        Opcode.IPUT_OBJECT,
+        Opcode.MOVE_OBJECT_FROM16,
+        Opcode.IPUT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.NEW_INSTANCE,
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.MOVE_OBJECT_FROM16,
+        Opcode.IPUT_OBJECT,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.CONST,
+        Opcode.CONST_4,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IPUT_OBJECT
+    )
+)