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

Merge pull request #4555 from Stypox/playqueue-crash

Browse source 
Fix NullPointerException in queue handling
This commit is contained in:
Tobias Groza 2020-11-08 01:19:38 +01:00 • committed by GitHub
commit f4435f9031
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
View file

@ -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);