feat(YouTube): Support version 18.29.38

src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/KidsMinimizedPlaybackPolicyControllerFingerprint.kt

@@ -4,22 +4,31 @@ import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.iface.instruction.NarrowLiteralInstruction
 
 object KidsMinimizedPlaybackPolicyControllerFingerprint : MethodFingerprint(
     returnType = "V",
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
-    parameters =  listOf("I", "L", "L"),
+    parameters = listOf("I", "L", "L"),
     opcodes = listOf(
-        Opcode.IF_EQZ,
+        Opcode.CONST_4,
+        Opcode.IF_NE,
         Opcode.SGET_OBJECT,
         Opcode.IF_NE,
-        Opcode.CONST_4,
-        Opcode.IPUT_BOOLEAN,
-        Opcode.IF_EQZ,
         Opcode.IGET,
-        Opcode.INVOKE_STATIC
+        Opcode.CONST_4,
+        Opcode.IF_NE,
+        Opcode.IGET_OBJECT,
+        Opcode.SGET_OBJECT,
+        Opcode.IF_EQ,
+        Opcode.GOTO,
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.RETURN_VOID
     ),
     customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("MinimizedPlaybackPolicyController;")
+        methodDef.implementation!!.instructions.any {
+            ((it as? NarrowLiteralInstruction)?.narrowLiteral == 5)
+        }
     }
 )

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/bytecode/patch/PlayerControlsBytecodePatch.kt

@@ -1,14 +1,17 @@
 package app.revanced.patches.youtube.misc.playercontrols.bytecode.patch
 
+import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.data.BytecodeContext
 import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 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.patches.shared.fingerprints.LayoutConstructorFingerprint
 import app.revanced.patches.youtube.misc.playercontrols.annotation.PlayerControlsCompatibility
 import app.revanced.patches.youtube.misc.playercontrols.fingerprints.BottomControlsInflateFingerprint
 import app.revanced.patches.youtube.misc.playercontrols.fingerprints.PlayerControlsVisibilityFingerprint
@@ -20,9 +23,17 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 @Description("Manages the code for the player controls of the YouTube player.")
 @PlayerControlsCompatibility
 class PlayerControlsBytecodePatch : BytecodePatch(
-    listOf(PlayerControlsVisibilityFingerprint, BottomControlsInflateFingerprint)
+    listOf(
+        LayoutConstructorFingerprint,
+        BottomControlsInflateFingerprint
+    )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
+        LayoutConstructorFingerprint.result?.let {
+            if (!PlayerControlsVisibilityFingerprint.resolve(context, it.classDef))
+                throw LayoutConstructorFingerprint.toErrorResult()
+        } ?: return LayoutConstructorFingerprint.toErrorResult()
+
         showPlayerControlsFingerprintResult = PlayerControlsVisibilityFingerprint.result!!
         inflateFingerprintResult = BottomControlsInflateFingerprint.result!!
 

src/main/kotlin/app/revanced/patches/youtube/misc/playercontrols/fingerprints/PlayerControlsVisibilityFingerprint.kt

@@ -7,8 +7,5 @@ import com.android.tools.smali.dexlib2.AccessFlags
 object PlayerControlsVisibilityFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PRIVATE or AccessFlags.FINAL,
     returnType = "V",
-    parameters = listOf("Z", "Z"),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
-    }
+    parameters = listOf("Z", "Z")
 )

src/main/kotlin/app/revanced/patches/youtube/misc/playertype/fingerprint/PlayerTypeFingerprint.kt

@@ -10,26 +10,8 @@ object PlayerTypeFingerprint : MethodFingerprint(
     accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
     parameters = listOf("L"),
     opcodes = listOf(
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
         Opcode.IF_NE,
-        Opcode.RETURN_VOID,
-        Opcode.IPUT_OBJECT,
-        Opcode.INVOKE_DIRECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_EQZ,
-        Opcode.CONST_4,
-        Opcode.INVOKE_STATIC,
-        Opcode.RETURN_VOID,
-        Opcode.CONST_4,
-        Opcode.INVOKE_STATIC,
-        Opcode.INVOKE_VIRTUAL,
         Opcode.RETURN_VOID
     ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("YouTubePlayerOverlaysLayout;")
-    }
+    customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("/YouTubePlayerOverlaysLayout;") }
 )

src/main/kotlin/app/revanced/patches/youtube/misc/playertype/fingerprint/VideoStateFingerprint.kt

@@ -17,8 +17,5 @@ object VideoStateFingerprint : MethodFingerprint(
         Opcode.IF_EQZ,
         Opcode.IF_EQZ,
         Opcode.IGET_OBJECT, // obfuscated parameter field name
-    ),
-    customFingerprint = { methodDef, _ ->
-        methodDef.definingClass.endsWith("YouTubeControlsOverlay;")
-    }
+    )
 )

src/main/kotlin/app/revanced/patches/youtube/misc/playertype/patch/PlayerTypeHookPatch.kt

@@ -12,33 +12,27 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.playertype.annotation.PlayerTypeHookCompatibility
 import app.revanced.patches.youtube.misc.playertype.fingerprint.PlayerTypeFingerprint
 import app.revanced.patches.youtube.misc.playertype.fingerprint.VideoStateFingerprint
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 
 @Name("Player type hook")
 @Description("Hook to get the current player type and video playback state.")
-@PlayerTypeHookCompatibility
 @DependsOn([IntegrationsPatch::class])
 class PlayerTypeHookPatch : BytecodePatch(
     listOf(PlayerTypeFingerprint, VideoStateFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-
-        PlayerTypeFingerprint.result?.let {
-            it.mutableMethod.apply {
-                addInstruction(
-                    0,
-                    "invoke-static {p1}, $INTEGRATIONS_CLASS_DESCRIPTOR->setPlayerType(Ljava/lang/Enum;)V"
-                )
-            }
-        } ?: return PlayerTypeFingerprint.toErrorResult()
+        PlayerTypeFingerprint.result?.mutableMethod?.addInstruction(
+            0,
+            "invoke-static {p1}, $INTEGRATIONS_CLASS_DESCRIPTOR->setPlayerType(Ljava/lang/Enum;)V"
+        ) ?: return PlayerTypeFingerprint.toErrorResult()
 
         VideoStateFingerprint.result?.let {
             it.mutableMethod.apply {
                 val endIndex = it.scanResult.patternScanResult!!.endIndex
                 val videoStateFieldName = getInstruction<ReferenceInstruction>(endIndex).reference
+
                 addInstructions(
                     0,
                     """