cleanup

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)
+        }
+    }
 )

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
+    }
 )

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<String, Method>()
 
-        // 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()
     }
 }

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
     )
 )

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
+    }
+)

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()
     }