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.oldqualitylayout.annotations
+
+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 OldQualityLayoutCompatibility
@@ -0,0 +1,66 @@
+package app.revanced.patches.youtube.layout.oldqualitylayout.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.extensions.or
+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.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.patcher.util.smali.toInstructions
+import app.revanced.patches.youtube.layout.oldqualitylayout.annotations.OldQualityLayoutCompatibility
+import app.revanced.patches.youtube.layout.oldqualitylayout.signatures.OldQualityParentSignature
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.instruction.BuilderInstruction21t
+
+@Patch
+@Name("old-quality-layout")
+@Description("Enable the original quality flyout menu.")
+@OldQualityLayoutCompatibility
+@Version("0.0.1")
+class OldQualityLayoutPatch : BytecodePatch(
+    listOf(
+        OldQualityParentSignature
+    )
+) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val result = signatures.first().result!!.findParentMethod(@Name("old-quality-signature") @MatchingMethod(
+            definingClass = "Libh"
+        ) @FuzzyPatternScanMethod(2) @OldQualityLayoutCompatibility @Version("0.0.1") object : MethodSignature(
+            "L", AccessFlags.FINAL or AccessFlags.PRIVATE, listOf("Z"), listOf(
+                Opcode.CONST_4,
+                Opcode.INVOKE_VIRTUAL,
+                Opcode.IGET_OBJECT,
+                Opcode.IGET_OBJECT,
+                Opcode.INVOKE_VIRTUAL,
+                Opcode.IGET_OBJECT,
+                Opcode.GOTO,
+                Opcode.IGET_OBJECT,
+            )
+        ) {}) ?: return PatchResultError("Required parent method could not be found.")
+
+        val implementation = result.method.implementation!!
+
+        // if useOldStyleQualitySettings == true, jump over all instructions
+        val jmpInstruction = BuilderInstruction21t(
+            Opcode.IF_NEZ, 0, implementation.instructions[result.scanData.endIndex].location.labels.first()
+        )
+        implementation.addInstruction(5, jmpInstruction)
+        implementation.addInstructions(
+            0, """
+                invoke-static { }, Lfi/razerman/youtube/XGlobals;->useOldStyleQualitySettings()Z
+                move-result v0
+            """.trimIndent().toInstructions()
+        )
+
+        return PatchResultSuccess()
+    }
+}
@@ -0,0 +1,50 @@
+package app.revanced.patches.youtube.layout.oldqualitylayout.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.oldqualitylayout.annotations.OldQualityLayoutCompatibility
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+@Name("old-quality-parent-method-signature")
+@MatchingMethod(
+    "Libh", "<init>"
+)
+@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
+@OldQualityLayoutCompatibility
+@Version("0.0.1")
+object OldQualityParentSignature : MethodSignature(
+    "V",
+    AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    listOf("L", "L", "L", "L", "L", "L", "L"),
+    listOf(
+        Opcode.INVOKE_DIRECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.SGET_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.SGET_OBJECT,
+        Opcode.IPUT_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.IGET_OBJECT,
+        Opcode.IF_NEZ,
+        Opcode.SGET_OBJECT,
+        Opcode.IGET_BOOLEAN,
+        Opcode.CONST_4,
+        Opcode.CONST_4,
+        Opcode.CONST_4,
+    )
+)