From 70761a667671d6b9ab462f323415e4bce8854bb4 Mon Sep 17 00:00:00 2001
From: inotia00 <ars258000@gmail.com>
Date: Fri, 30 Jun 2023 00:41:22 +0900
Subject: [PATCH] feat(youtube/default-video-speed): `Enable save video speed`
 not working in new layout

---
 .../NewVideoSpeedChangedFingerprint.kt        | 23 ++++++++++++
 .../video/speed/patch/VideoSpeedPatch.kt      | 37 +++++++++++++------
 2 files changed, 49 insertions(+), 11 deletions(-)
 create mode 100644 src/main/kotlin/app/revanced/patches/youtube/video/speed/fingerprints/NewVideoSpeedChangedFingerprint.kt

diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/speed/fingerprints/NewVideoSpeedChangedFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/video/speed/fingerprints/NewVideoSpeedChangedFingerprint.kt
new file mode 100644
index 000000000..0fe1baaef
--- /dev/null
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/fingerprints/NewVideoSpeedChangedFingerprint.kt
@@ -0,0 +1,23 @@
+package app.revanced.patches.youtube.video.speed.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.Opcode
+
+object NewVideoSpeedChangedFingerprint : MethodFingerprint(
+    returnType = "L",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("L"),
+    opcodes = listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IF_EQZ,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IGET,
+        Opcode.INVOKE_VIRTUAL
+    )
+)
diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/speed/patch/VideoSpeedPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/video/speed/patch/VideoSpeedPatch.kt
index 50f1c015b..c0ddce3eb 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/video/speed/patch/VideoSpeedPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/video/speed/patch/VideoSpeedPatch.kt
@@ -1,20 +1,24 @@
 package app.revanced.patches.youtube.video.speed.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
+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.patch.annotations.Patch
 import app.revanced.patches.youtube.utils.annotations.YouTubeCompatibility
+import app.revanced.patches.youtube.utils.fingerprints.NewFlyoutPanelsOnClickListenerFingerprint
 import app.revanced.patches.youtube.utils.overridespeed.patch.OverrideSpeedHookPatch
 import app.revanced.patches.youtube.utils.settings.resource.patch.SettingsPatch
 import app.revanced.patches.youtube.utils.videocpn.patch.VideoCpnPatch
+import app.revanced.patches.youtube.video.speed.fingerprints.NewVideoSpeedChangedFingerprint
 import app.revanced.util.integrations.Constants.VIDEO_PATH
 import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
 
@@ -29,20 +33,31 @@ import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
 )
 @YouTubeCompatibility
 @Version("0.0.1")
-class VideoSpeedPatch : BytecodePatch() {
+class VideoSpeedPatch : BytecodePatch(
+    listOf(NewFlyoutPanelsOnClickListenerFingerprint)
+) {
     override fun execute(context: BytecodeContext): PatchResult {
 
-        OverrideSpeedHookPatch.videoSpeedChangedResult.let {
-            it.mutableMethod.apply {
-                val index = it.scanResult.patternScanResult!!.endIndex
-                val register = getInstruction<FiveRegisterInstruction>(index).registerD
-
-                addInstruction(
-                    index,
-                    "invoke-static {v$register}, $INTEGRATIONS_VIDEO_SPEED_CLASS_DESCRIPTOR->userChangedSpeed(F)V"
+        NewFlyoutPanelsOnClickListenerFingerprint.result?.let { parentResult ->
+            NewVideoSpeedChangedFingerprint.also {
+                it.resolve(
+                    context,
+                    parentResult.classDef
                 )
-            }
-        }
+            }.result?.let { result ->
+                arrayOf(result, OverrideSpeedHookPatch.videoSpeedChangedResult).forEach {
+                    it.mutableMethod.apply {
+                        val index = it.scanResult.patternScanResult!!.endIndex
+                        val register = getInstruction<FiveRegisterInstruction>(index).registerD
+
+                        addInstruction(
+                            index,
+                            "invoke-static {v$register}, $INTEGRATIONS_VIDEO_SPEED_CLASS_DESCRIPTOR->userChangedSpeed(F)V"
+                        )
+                    }
+                }
+            } ?: return NewVideoSpeedChangedFingerprint.toErrorResult()
+        } ?: return NewFlyoutPanelsOnClickListenerFingerprint.toErrorResult()
 
         VideoCpnPatch.injectCall("$INTEGRATIONS_VIDEO_SPEED_CLASS_DESCRIPTOR->newVideoStarted(Ljava/lang/String;Z)V")