From eb277fe14b87b35118cea41dc74fb8c2e2ba7b1c Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 6 Sep 2025 15:31:14 +0200
Subject: [PATCH] Player/handleIntent: call handleIntentPost unconditionally

We always need to handleIntentPost otherwise the VideoDetailFragment
is not setup correctly.
---
 app/src/main/java/org/schabi/newpipe/player/Player.java     | 6 +-----
 .../main/java/org/schabi/newpipe/player/PlayerService.java  | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index 1664dc0e3..f98e4295d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -375,7 +375,6 @@ public final class Player implements PlaybackListener, Listener {
             }
         }
 
-        final PlayerType oldPlayerType = playerType;
         playerType = newPlayerType;
         initUIsForCurrentPlayerType();
         isAudioOnly = audioPlayerSelected();
@@ -459,8 +458,6 @@ public final class Player implements PlaybackListener, Listener {
                                 initPlayback(newPlayQueue, playWhenReady);
                             }
 
-                            handleIntentPost(oldPlayerType);
-
                         }, throwable -> {
                             // This will only show a snackbar if the passed context has a root view:
                             // otherwise it will resort to showing a notification, so we are safe
@@ -560,11 +557,10 @@ public final class Player implements PlaybackListener, Listener {
             initPlayback(samePlayQueue ? playQueue : newQueue, playWhenReady);
         }
 
-        handleIntentPost(oldPlayerType);
     }
 
 
-    private void handleIntentPost(final PlayerType oldPlayerType) {
+    public void handleIntentPost(final PlayerType oldPlayerType) {
         if (oldPlayerType != playerType && playQueue != null) {
             // If playerType changes from one to another we should reload the player
             // (to disable/enable video stream or to set quality)
diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayerService.java b/app/src/main/java/org/schabi/newpipe/player/PlayerService.java
index adc050e4b..3b6224b47 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PlayerService.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PlayerService.java
@@ -169,7 +169,9 @@ public final class PlayerService extends MediaBrowserServiceCompat {
         }
 
         if (player != null) {
+            final PlayerType oldPlayerType = player.getPlayerType();
             player.handleIntent(intent);
+            player.handleIntentPost(oldPlayerType);
             player.UIs().get(MediaSessionPlayerUi.class)
                     .ifPresent(ui -> ui.handleMediaButtonIntent(intent));
         }