Skip to content

Fix video playback when exiting popup to main screen #13437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Y2kz wants to merge 3 commits into
base: dev
Choose a base branch
from
+19 −3
Open

Fix video playback when exiting popup to main screen #13437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70dad9b
Fix video playback when exiting popup to fullscreen
Y2kz Apr 19, 2026
5cc2950
Split line into two address CI build error
Y2kz Apr 19, 2026
f29b465
Removed comment
Y2kz Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ public final class VideoDetailFragment
int lastStableBottomSheetState = BottomSheetBehavior.STATE_EXPANDED;
@State
protected boolean autoPlayEnabled = true;
private boolean forceFullscreen = false;

@Nullable
private StreamInfo currentInfo = null;
Expand Down Expand Up @@ -877,7 +878,7 @@ private void runWorker(final boolean forceLoad, final boolean addToBackStack) {
}
}

if (isAutoplayEnabled()) {
if (isAutoplayEnabled() || forceFullscreen) {
openVideoPlayerAutoFullscreen();
}
}
Expand Down Expand Up @@ -1142,7 +1143,18 @@ public void openVideoPlayer(final boolean directlyFullscreenIfApplicable) {
* = false}, hence preventing it from going directly fullscreen.
*/
public void openVideoPlayerAutoFullscreen() {
Copy link
Copy Markdown
Contributor

@TobiGr TobiGr Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please update this JDoc according to your changes.

openVideoPlayer(PlayerHelper.isStartMainPlayerFullscreenEnabled(requireContext()));
openVideoPlayer(forceFullscreen
|| PlayerHelper.isStartMainPlayerFullscreenEnabled(requireContext()));
forceFullscreen = false;
}

public void setForceFullscreen(final boolean force) {
this.forceFullscreen = force;
}

@Nullable
public String getUrl() {
return url;
}

private void openNormalBackgroundPlayer(final boolean append) {
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.schabi.newpipe.util;

import static android.text.TextUtils.isEmpty;
import android.text.TextUtils;
import static org.schabi.newpipe.util.ListHelper.getUrlAndNonTorrentStreams;

import android.annotation.SuppressLint;
Expand Down Expand Up @@ -430,13 +431,16 @@ public static void openVideoDetailFragment(@NonNull final Context context,
final RunnableWithVideoDetailFragment onVideoDetailFragmentReady = detailFragment -> {
expandMainPlayer(detailFragment.requireActivity());
detailFragment.setAutoPlay(autoPlay);
if (switchingPlayers) {
if (switchingPlayers && TextUtils.equals(detailFragment.getUrl(), url)) {
// Situation when user switches from players to main player. All needed data is
// here, we can start watching (assuming newQueue equals playQueue).
// Starting directly in fullscreen if the previous player type was popup.
detailFragment.openVideoPlayer(playerType == PlayerType.POPUP
|| PlayerHelper.isStartMainPlayerFullscreenEnabled(context));
} else {
if (switchingPlayers && playerType == PlayerType.POPUP) {
detailFragment.setForceFullscreen(true);
}
detailFragment.selectAndLoadVideo(serviceId, url, title, playQueue);
}
detailFragment.scrollToTop();
Expand Down
Loading