fix(YouTube - Minimized playback): Fix pip incorrectly showing for Sh…

…ort playback (#3170)
ReVanced · Oct 20, 2023 · 7a07507 · 7a07507
1 parent 8f341bb
commit 7a07507
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 44 deletions.
diff --git a/...main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt b/...main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt
@@ -13,7 +13,7 @@ import app.revanced.patches.shared.settings.preference.impl.NonInteractivePrefer
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch
 import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.KidsMinimizedPlaybackPolicyControllerFingerprint
-import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackManagerFingerprint
+import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackPlayerResponseProcessorFingerprint
 import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackSettingsFingerprint
 import app.revanced.patches.youtube.misc.minimizedplayback.fingerprints.MinimizedPlaybackSettingsParentFingerprint
 import app.revanced.patches.youtube.misc.playertype.PlayerTypeHookPatch
@@ -44,7 +44,7 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 @Suppress("unused")
 object MinimizedPlaybackPatch : BytecodePatch(
     setOf(
-        MinimizedPlaybackManagerFingerprint,
+        MinimizedPlaybackPlayerResponseProcessorFingerprint,
         MinimizedPlaybackSettingsParentFingerprint,
         KidsMinimizedPlaybackPolicyControllerFingerprint
     )
@@ -63,16 +63,16 @@ object MinimizedPlaybackPatch : BytecodePatch(
             )
         )
 
-        MinimizedPlaybackManagerFingerprint.result?.apply {
+        MinimizedPlaybackPlayerResponseProcessorFingerprint.result?.apply {
             mutableMethod.addInstructions(
                 0,
                 """
-                    invoke-static {}, $INTEGRATIONS_CLASS_DESCRIPTOR->isPlaybackNotShort()Z
+                    invoke-static { }, $INTEGRATIONS_CLASS_DESCRIPTOR->videoSupportsMinimizedPlayback()Z
                     move-result v0
                     return v0
                 """
             )
-        } ?: throw MinimizedPlaybackManagerFingerprint.exception
+        } ?: throw MinimizedPlaybackPlayerResponseProcessorFingerprint.exception
 
         // Enable minimized playback option in YouTube settings
         MinimizedPlaybackSettingsParentFingerprint.result ?: throw MinimizedPlaybackSettingsParentFingerprint.exception

diff --git a/...atches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt b/...atches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackManagerFingerprint.kt
diff --git a/...isc/minimizedplayback/fingerprints/MinimizedPlaybackPlayerResponseProcessorFingerprint.kt b/...isc/minimizedplayback/fingerprints/MinimizedPlaybackPlayerResponseProcessorFingerprint.kt
@@ -0,0 +1,29 @@
+package app.revanced.patches.youtube.misc.minimizedplayback.fingerprints
+
+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
+
+object MinimizedPlaybackPlayerResponseProcessorFingerprint : MethodFingerprint(
+    "Z",
+    AccessFlags.PUBLIC or AccessFlags.FINAL,
+    listOf("Lcom/google/android/libraries/youtube/innertube/model/player/PlayerResponseModel;", "I"),
+    listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.CONST_4,
+        Opcode.IF_EQZ,
+        Opcode.INVOKE_STATIC,
+        Opcode.MOVE_RESULT,
+        Opcode.CONST_4,
+        Opcode.IF_NEZ,
+        Opcode.CONST_4,
+        Opcode.IF_EQ,
+        Opcode.GOTO,
+        Opcode.RETURN,
+        Opcode.CONST_4,
+        Opcode.RETURN
+    )
+)