jellyfin/jellyfin-android
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-android.git synced 2026-09-02 21:04:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix PiP behavior

Browse Source
This commit is contained in:
Niels van Velzen
2026-06-27 14:40:56 +02:00
committed by Niels van Velzen
parent b4d4837fda
commit dde3d88f60
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/jellyfin/mobile/player/ui/PlayerFragment.kt
+10 -2
View File
@@ -100,7 +100,10 @@ class PlayerFragment : Fragment(), BackPressInterceptor {
// Observe ViewModel
viewModel.player.observe(this) { player ->
playerView.player = player
if (player == null) parentFragmentManager.popBackStack()
// Automatically close fragment, unless we're in PiP mode
if (player == null && !(AndroidVersion.isAtLeastN && requireActivity().isInPictureInPictureMode)) {
parentFragmentManager.popBackStack()
}
}
viewModel.playerState.observe(this) { playerState ->
val isPlaying = viewModel.playerOrNull?.isPlaying == true
@@ -229,6 +232,11 @@ class PlayerFragment : Fragment(), BackPressInterceptor {
if (isLandscape()) {
playerFullscreenHelper.enableFullscreen()
}
// If playback ended during picture in picture we'll return to the main app when PiP is closed
if (viewModel.playerOrNull == null) {
parentFragmentManager.popBackStack()
}
}
/**
@@ -359,7 +367,7 @@ class PlayerFragment : Fragment(), BackPressInterceptor {
}
fun onUserLeaveHint() {
if (AndroidVersion.isAtLeastN && viewModel.playerOrNull?.isPlaying == true) {
if (AndroidVersion.isAtLeastN && viewModel.playerOrNull != null) {
requireActivity().enterPictureInPicture()
}
}