From 52fd726d9b0d2efbd0f9742fc84ad01ccdcff168 Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Wed, 13 Apr 2022 05:18:12 +0200
Subject: [PATCH] fix: `enable-seekbar-tapping` patch

---
 src/main/kotlin/app/revanced/patches/Index.kt |  4 +-
 .../interaction/EnableSeekbarTapping.kt       | 46 ++++---------------
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patches/Index.kt b/src/main/kotlin/app/revanced/patches/Index.kt
index cec102db..8a9ce471 100644
--- a/src/main/kotlin/app/revanced/patches/Index.kt
+++ b/src/main/kotlin/app/revanced/patches/Index.kt
@@ -16,13 +16,13 @@ object Index {
      * New patches should be added to the array.
      */
     val patches: Array<() -> Patch> = arrayOf(
+        ::Integrations,
         ::VideoAds,
         ::MinimizedPlayback,
         ::CreateButtonRemover,
         ::HideReels,
         ::HideSuggestions,
         ::OldQualityLayout,
-        ::EnableSeekbarTapping,
-        ::Integrations
+        ::EnableSeekbarTapping
     )
 }
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/interaction/EnableSeekbarTapping.kt b/src/main/kotlin/app/revanced/patches/interaction/EnableSeekbarTapping.kt
index 9b1df3d6..386f1b02 100644
--- a/src/main/kotlin/app/revanced/patches/interaction/EnableSeekbarTapping.kt
+++ b/src/main/kotlin/app/revanced/patches/interaction/EnableSeekbarTapping.kt
@@ -8,14 +8,12 @@ import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.smali.asInstructions
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.instruction.BuilderInstruction21t
-import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
 import org.jf.dexlib2.iface.Method
 import org.jf.dexlib2.iface.instruction.formats.Instruction11n
-import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
 
 class EnableSeekbarTapping : Patch("enable-seekbar-tapping") {
     override fun execute(cache: Cache): PatchResult {
-        val map = cache.methodMap["tap-seekbar-parent-method"]
+        var map = cache.methodMap["tap-seekbar-parent-method"]
 
         val tapSeekMethods = mutableMapOf<String, Method>()
 
@@ -39,45 +37,21 @@ class EnableSeekbarTapping : Patch("enable-seekbar-tapping") {
             if (literal == 2) tapSeekMethods["O"] = it
         }
 
-        val implementation = cache.methodMap["enable-seekbar-tapping"].method.implementation!!
+        // replace map because we dont need the upper one anymore
+        map = cache.methodMap["enable-seekbar-tapping"]
+
+        val implementation = map.method.implementation!!
 
         // if tap-seeking is enabled, do not invoke the two methods below
         val pMethod = tapSeekMethods["P"]!!
         val oMethod = tapSeekMethods["O"]!!
+
         implementation.addInstructions(
             map.scanData.endIndex,
-            listOf(
-                BuilderInstruction35c(
-                    Opcode.INVOKE_VIRTUAL,
-                    0,
-                    3,
-                    0,
-                    0,
-                    0,
-                    0,
-                    ImmutableMethodReference(
-                        oMethod.definingClass,
-                        oMethod.name,
-                        setOf("I"),
-                        "V"
-                    )
-                ),
-                BuilderInstruction35c(
-                    Opcode.INVOKE_VIRTUAL,
-                    0,
-                    3,
-                    0,
-                    0,
-                    0,
-                    0,
-                    ImmutableMethodReference(
-                        pMethod.definingClass,
-                        pMethod.name,
-                        setOf("I"),
-                        "V"
-                    )
-                )
-            )
+            """
+               invoke-virtual { v12, v2 }, ${oMethod.definingClass}->${oMethod.name}(I)V
+               invoke-virtual { v12, v2 }, ${pMethod.definingClass}->${pMethod.name}(I)V
+            """.trimIndent().asInstructions()
         )
 
         // if tap-seeking is disabled, do not invoke the two methods above by jumping to the else label