fix(YouTube - Hide end screen cards): Hide new type of end screen card (#6027)

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/Fingerprints.kt

@@ -1,8 +1,13 @@
 package app.revanced.patches.youtube.layout.hide.endscreencards
 
 import app.revanced.patcher.fingerprint
+import app.revanced.util.containsLiteralInstruction
+import app.revanced.util.getReference
+import app.revanced.util.indexOfFirstInstruction
 import app.revanced.util.literal
+import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 
 internal val layoutCircleFingerprint = fingerprint {
     returns("Landroid/view/View;")
@@ -38,3 +43,19 @@ internal val layoutVideoFingerprint = fingerprint {
     )
     literal { layoutVideo }
 }
+
+internal val showEndscreenCardsFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("V")
+    parameters("L")
+    custom { method, classDef ->
+        classDef.methods.count() == 5
+                && method.containsLiteralInstruction(0)
+                && method.containsLiteralInstruction(5)
+                && method.containsLiteralInstruction(8)
+                && method.indexOfFirstInstruction {
+            val reference = getReference<FieldReference>()
+            reference?.type == "Lcom/google/android/libraries/youtube/innertube/model/player/PlayerResponseModel;"
+        } >= 0
+    }
+}

patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndScreenCardsPatch.kt

@@ -1,6 +1,7 @@
 package app.revanced.patches.youtube.layout.hide.endscreencards
 
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
 import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
@@ -11,6 +12,8 @@ import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
 import app.revanced.patches.shared.misc.mapping.resourceMappings
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.playservice.is_19_43_or_greater
+import app.revanced.patches.youtube.misc.playservice.versionCheckPatch
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
@@ -22,7 +25,7 @@ internal var layoutIcon = -1L
 internal var layoutVideo = -1L
     private set
 
-private val hideEndscreenCardsResourcePatch = resourcePatch {
+private val hideEndScreenCardsResourcePatch = resourcePatch {
     dependsOn(
         settingsPatch,
         resourceMappingPatch,
@@ -30,7 +33,7 @@ private val hideEndscreenCardsResourcePatch = resourcePatch {
     )
 
     execute {
-        addResources("youtube", "layout.hide.endscreencards.hideEndscreenCardsResourcePatch")
+        addResources("youtube", "layout.hide.endscreencards.hideEndScreenCardsResourcePatch")
 
         PreferenceScreen.PLAYER.addPreferences(
             SwitchPreference("revanced_hide_endscreen_cards"),
@@ -45,16 +48,17 @@ private val hideEndscreenCardsResourcePatch = resourcePatch {
 }
 
 private const val EXTENSION_CLASS_DESCRIPTOR =
-    "Lapp/revanced/extension/youtube/patches/HideEndscreenCardsPatch;"
+    "Lapp/revanced/extension/youtube/patches/HideEndScreenCardsPatch;"
 
 @Suppress("unused")
-val hideEndscreenCardsPatch = bytecodePatch(
+val hideEndScreenCardsPatch = bytecodePatch(
     name = "Hide end screen cards",
     description = "Adds an option to hide suggested video cards at the end of videos.",
 ) {
     dependsOn(
         sharedExtensionPatch,
-        hideEndscreenCardsResourcePatch,
+        hideEndScreenCardsResourcePatch,
+        versionCheckPatch
     )
 
     compatibleWith(
@@ -78,9 +82,24 @@ val hideEndscreenCardsPatch = bytecodePatch(
 
                 addInstruction(
                     insertIndex,
-                    "invoke-static { v$viewRegister }, $EXTENSION_CLASS_DESCRIPTOR->hideEndscreen(Landroid/view/View;)V",
+                    "invoke-static { v$viewRegister }, " +
+                            "$EXTENSION_CLASS_DESCRIPTOR->hideEndScreenCardView(Landroid/view/View;)V",
                 )
             }
         }
+
+        if (is_19_43_or_greater) {
+            showEndscreenCardsFingerprint.method.addInstructionsWithLabels(
+                0,
+                """
+                    invoke-static {}, $EXTENSION_CLASS_DESCRIPTOR->hideEndScreenCards()Z
+                    move-result v0
+                    if-eqz v0, :show
+                    return-void
+                    :show
+                    nop
+                """
+            )
+        }
     }
 }