mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-12-23 08:30:44 +00:00
Merge pull request #4555 from Stypox/playqueue-crash
Fix NullPointerException in queue handling
This commit is contained in:
commit
f4435f9031
@ -1735,32 +1735,34 @@ public class VideoDetailFragment
|
||||
@Override
|
||||
public void onQueueUpdate(final PlayQueue queue) {
|
||||
playQueue = queue;
|
||||
// This should be the only place where we push data to stack.
|
||||
// It will allow to have live instance of PlayQueue with actual information about
|
||||
// deleted/added items inside Channel/Playlist queue and makes possible to have
|
||||
// a history of played items
|
||||
if ((stack.isEmpty() || !stack.peek().getPlayQueue().equals(queue)
|
||||
&& queue.getItem() != null)) {
|
||||
stack.push(new StackItem(queue.getItem().getServiceId(),
|
||||
queue.getItem().getUrl(),
|
||||
queue.getItem().getTitle(),
|
||||
queue));
|
||||
} else {
|
||||
final StackItem stackWithQueue = findQueueInStack(queue);
|
||||
if (stackWithQueue != null) {
|
||||
// On every MainPlayer service's destroy() playQueue gets disposed and
|
||||
// no longer able to track progress. That's why we update our cached disposed
|
||||
// queue with the new one that is active and have the same history.
|
||||
// Without that the cached playQueue will have an old recovery position
|
||||
stackWithQueue.setPlayQueue(queue);
|
||||
}
|
||||
}
|
||||
|
||||
if (DEBUG) {
|
||||
Log.d(TAG, "onQueueUpdate() called with: serviceId = ["
|
||||
+ serviceId + "], videoUrl = [" + url + "], name = ["
|
||||
+ name + "], playQueue = [" + playQueue + "]");
|
||||
}
|
||||
|
||||
// This should be the only place where we push data to stack.
|
||||
// It will allow to have live instance of PlayQueue with actual information about
|
||||
// deleted/added items inside Channel/Playlist queue and makes possible to have
|
||||
// a history of played items
|
||||
@Nullable final StackItem stackPeek = stack.peek();
|
||||
if (stackPeek != null && stackPeek.getPlayQueue().equals(queue)) {
|
||||
@Nullable final PlayQueueItem playQueueItem = queue.getItem();
|
||||
if (playQueueItem != null) {
|
||||
stack.push(new StackItem(playQueueItem.getServiceId(), playQueueItem.getUrl(),
|
||||
playQueueItem.getTitle(), queue));
|
||||
return;
|
||||
} // else continue below
|
||||
}
|
||||
|
||||
@Nullable final StackItem stackWithQueue = findQueueInStack(queue);
|
||||
if (stackWithQueue != null) {
|
||||
// On every MainPlayer service's destroy() playQueue gets disposed and
|
||||
// no longer able to track progress. That's why we update our cached disposed
|
||||
// queue with the new one that is active and have the same history.
|
||||
// Without that the cached playQueue will have an old recovery position
|
||||
stackWithQueue.setPlayQueue(queue);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -2062,6 +2064,7 @@ public class VideoDetailFragment
|
||||
return url == null;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
private StackItem findQueueInStack(final PlayQueue queue) {
|
||||
StackItem item = null;
|
||||
final Iterator<StackItem> iterator = stack.descendingIterator();
|
||||
|
@ -167,19 +167,20 @@ public abstract class PlayQueue implements Serializable {
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the current item that should be played
|
||||
* @return the current item that should be played, or null if the queue is empty
|
||||
*/
|
||||
@Nullable
|
||||
public PlayQueueItem getItem() {
|
||||
return getItem(getIndex());
|
||||
}
|
||||
|
||||
/**
|
||||
* @param index the index of the item to return
|
||||
* @return the item at the given index
|
||||
* @throws IndexOutOfBoundsException
|
||||
* @return the item at the given index, or null if the index is out of bounds
|
||||
*/
|
||||
@Nullable
|
||||
public PlayQueueItem getItem(final int index) {
|
||||
if (index < 0 || index >= streams.size() || streams.get(index) == null) {
|
||||
if (index < 0 || index >= streams.size()) {
|
||||
return null;
|
||||
}
|
||||
return streams.get(index);
|
||||
|
Loading…
Reference in New Issue
Block a user