Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Add conditional guard to prevent useVideoAndSubtitles overwriting recovery position that was set in Player.handleIntent for RESUME_PLAYBACK when resuming playback

Browse source
This commit is contained in:
AbsurdlyLongUsername 2026-02-05 04:36:53 +00:00
parent b7d69682f7
commit bd255606d6
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/org/schabi/newpipe/player/Player.java
View file

@ -2210,6 +2210,13 @@ public final class Player implements PlaybackListener, Listener {
isAudioOnly = !videoAndSubtitlesEnabled; isAudioOnly = !videoAndSubtitlesEnabled;
final var item = playQueue.getItem();
final boolean hasPendingRecovery =
item != null && item.getRecoveryPosition() != PlayQueueItem.RECOVERY_UNSET;
final boolean hasTimeline =
!exoPlayerIsNull() && !simpleExoPlayer.getCurrentTimeline().isEmpty();
getCurrentStreamInfo().ifPresentOrElse(info -> { getCurrentStreamInfo().ifPresentOrElse(info -> {
// In case we don't know the source type, fall back to either video-with-audio, or // In case we don't know the source type, fall back to either video-with-audio, or
// audio-only source type // audio-only source type
@ -2217,6 +2224,10 @@ public final class Player implements PlaybackListener, Listener {
.orElse(SourceType.VIDEO_WITH_AUDIO_OR_AUDIO_ONLY); .orElse(SourceType.VIDEO_WITH_AUDIO_OR_AUDIO_ONLY);
setRecovery(); // making sure to save playback position before reloadPlayQueueManager() setRecovery(); // making sure to save playback position before reloadPlayQueueManager()
if (hasTimeline || !hasPendingRecovery) {
// making sure to save playback position before reloadPlayQueueManager()
setRecovery();
}
if (playQueueManagerReloadingNeeded(sourceType, info, getVideoRendererIndex())) { if (playQueueManagerReloadingNeeded(sourceType, info, getVideoRendererIndex())) {
reloadPlayQueueManager(); reloadPlayQueueManager();
@ -2230,6 +2241,10 @@ public final class Player implements PlaybackListener, Listener {
index of the video renderer or playQueueManagerReloadingNeeded returns true index of the video renderer or playQueueManagerReloadingNeeded returns true
*/ */
setRecovery(); // making sure to save playback position before reloadPlayQueueManager() setRecovery(); // making sure to save playback position before reloadPlayQueueManager()
if (hasTimeline || !hasPendingRecovery) {
// making sure to save playback position before reloadPlayQueueManager()
setRecovery();
}
reloadPlayQueueManager(); reloadPlayQueueManager();
}); });