fix(YouTube - Disable double tap actions): Remove old incompatible targets

extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/DisableDoubleTapActionsPatch.java

@@ -3,7 +3,7 @@ package app.revanced.extension.youtube.patches;
 import app.revanced.extension.youtube.settings.Settings;
 
 @SuppressWarnings("unused")
-public final class DisableChapterSkipDoubleTapPatch {
+public final class DisableDoubleTapActionsPatch {
 
     /**
      * Injection point.

patches/api/patches.api

@@ -1238,6 +1238,7 @@ public final class app/revanced/patches/youtube/interaction/dialog/RemoveViewerD
 
 public final class app/revanced/patches/youtube/interaction/doubletap/DisableChapterSkipDoubleTapPatchKt {
 	public static final fun getDisableChapterSkipDoubleTapPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
+	public static final fun getDisableDoubleTapActionsPatch ()Lapp/revanced/patcher/patch/BytecodePatch;
 }
 
 public final class app/revanced/patches/youtube/interaction/downloads/DownloadsPatchKt {

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/doubletap/DisableChapterSkipDoubleTapPatch.kt

@@ -1,6 +1,7 @@
 package app.revanced.patches.youtube.interaction.doubletap
 
 import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
+import app.revanced.patcher.fingerprint
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
@@ -8,12 +9,14 @@ import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
 
 private const val EXTENSION_CLASS_DESCRIPTOR =
-    "Lapp/revanced/extension/youtube/patches/DisableChapterSkipDoubleTapPatch;"
+    "Lapp/revanced/extension/youtube/patches/DisableDoubleTapActionsPatch;"
 
 @Suppress("unused")
-val disableChapterSkipDoubleTapPatch = bytecodePatch(
+val disableDoubleTapActionsPatch = bytecodePatch(
     name = "Disable double tap actions",
     description = "Adds an option to disable player double tap gestures.",
 ) {
@@ -25,9 +28,6 @@ val disableChapterSkipDoubleTapPatch = bytecodePatch(
 
     compatibleWith(
         "com.google.android.youtube"(
-            "19.34.42",
-            "19.43.41",
-            "19.47.53",
             "20.07.39",
             "20.12.46",
             "20.13.41",
@@ -35,12 +35,28 @@ val disableChapterSkipDoubleTapPatch = bytecodePatch(
     )
 
     execute {
-        addResources("youtube", "interaction.doubletap.disableChapterSkipDoubleTapPatch")
+        addResources("youtube", "interaction.doubletap.disableDoubleTapActionsPatch")
 
         PreferenceScreen.PLAYER.addPreferences(
             SwitchPreference("revanced_disable_chapter_skip_double_tap"),
         )
 
+        val doubleTapInfoGetSeekSourceFingerprint = fingerprint {
+            accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+            parameters("Z")
+            returns(seekTypeEnumFingerprint.originalClassDef.type)
+            opcodes(
+                Opcode.IF_EQZ,
+                Opcode.SGET_OBJECT,
+                Opcode.RETURN_OBJECT,
+                Opcode.SGET_OBJECT,
+                Opcode.RETURN_OBJECT,
+            )
+            custom { _, classDef ->
+                classDef.fields.count() == 4
+            }
+        }
+
         // Force isChapterSeek flag to false.
         doubleTapInfoGetSeekSourceFingerprint.method.addInstructions(
             0,
@@ -60,4 +76,9 @@ val disableChapterSkipDoubleTapPatch = bytecodePatch(
             """
         )
     }
-}
+}
+
+@Deprecated("Patch was renamed", ReplaceWith("disableDoubleTapActionsPatch"))
+val disableChapterSkipDoubleTapPatch = bytecodePatch {
+    dependsOn(disableDoubleTapActionsPatch)
+}

patches/src/main/kotlin/app/revanced/patches/youtube/interaction/doubletap/Fingerprints.kt

@@ -2,22 +2,13 @@ package app.revanced.patches.youtube.interaction.doubletap
 
 import app.revanced.patcher.fingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
-import com.android.tools.smali.dexlib2.Opcode
 
-internal val doubleTapInfoGetSeekSourceFingerprint = fingerprint {
+internal val seekTypeEnumFingerprint = fingerprint {
-    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    accessFlags(AccessFlags.STATIC, AccessFlags.CONSTRUCTOR)
-    parameters("Z")
+    strings(
-    returns("L")  // Enum SeekSource, but name obfuscated.
+        "SEEK_SOURCE_SEEK_TO_NEXT_CHAPTER",
-    opcodes(
+        "SEEK_SOURCE_SEEK_TO_PREVIOUS_CHAPTER"
-        Opcode.IF_EQZ,
-        Opcode.SGET_OBJECT,
-        Opcode.RETURN_OBJECT,
-        Opcode.SGET_OBJECT,
-        Opcode.RETURN_OBJECT,
     )
-    custom { _, classDef ->
-        classDef.fields.count() == 4
-    }
 }
 
 internal val doubleTapInfoCtorFingerprint = fingerprint {

patches/src/main/resources/addresources/values/strings.xml

@@ -516,7 +516,7 @@ This feature is only available for older devices"</string>
             <string name="revanced_remove_viewer_discretion_dialog_summary_off">Dialog will be shown</string>
             <string name="revanced_remove_viewer_discretion_dialog_user_dialog_message">This does not bypass the age restriction. It just accepts it automatically.</string>
         </patch>
-        <patch id="interaction.doubletap.disableChapterSkipDoubleTapPatch">
+        <patch id="interaction.doubletap.disableDoubleTapActionsPatch">
             <string name="revanced_disable_chapter_skip_double_tap_title">Disable double tap chapter skip</string>
             <string name="revanced_disable_chapter_skip_double_tap_summary_on">Double tap can never trigger a skip to the next/previous chapter</string>
             <string name="revanced_disable_chapter_skip_double_tap_summary_off">Double tap can occasionally trigger a skip to the next/previous chapter</string>