fix(sponsorblock): dynamically insert setSponsorBarRect call (#644)

2022-09-27 22:00:24 +02:00
parent 36ab007924
commit d5ee3b006d
1 changed files with 8 additions and 4 deletions
@@ -99,10 +99,14 @@ class SponsorBlockBytecodePatch : BytecodePatch(
        /*
         Get the instance of the seekbar rectangle
         */
-        seekbarMethod.addInstruction(
-            1,
-            "invoke-static {v0}, Lapp/revanced/integrations/sponsorblock/PlayerController;->setSponsorBarRect(Ljava/lang/Object;)V"
-        )
+        for ((index, instruction) in seekbarMethodInstructions.withIndex()) {
+            if (instruction.opcode != Opcode.MOVE_OBJECT_FROM16) continue
+            seekbarMethod.addInstruction(
+                index + 1,
+                "invoke-static {v0}, Lapp/revanced/integrations/sponsorblock/PlayerController;->setSponsorBarRect(Ljava/lang/Object;)V"
+            )
+            break
+        }

        for ((index, instruction) in seekbarMethodInstructions.withIndex()) {
            if (instruction.opcode != Opcode.INVOKE_STATIC) continue