baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 8 Packages Wiki Activity

Fix NPE and add some @Nullables

Browse source 
Fix NullPointerException in PlayerHolder.getQueueSize() and add `@Nullable` here and there so that the linter reports risks of NPEs
This commit is contained in:
Stypox 2022-01-25 17:37:15 +01:00
parent ac53196dcc
commit 5108d75682
No known key found for this signature in database
GPG key ID: 4BDF1B40A49FDD23
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -260,7 +260,8 @@ public final class Player implements
// Playback // Playback
//////////////////////////////////////////////////////////////////////////*/ //////////////////////////////////////////////////////////////////////////*/
private PlayQueue playQueue; // play queue might be null e.g. while player is starting
@Nullable private PlayQueue playQueue;
private PlayQueueAdapter playQueueAdapter; private PlayQueueAdapter playQueueAdapter;
private StreamSegmentAdapter segmentAdapter; private StreamSegmentAdapter segmentAdapter;
@ -4202,6 +4203,7 @@ public final class Player implements
} }
@Nullable
public PlayQueue getPlayQueue() { public PlayQueue getPlayQueue() {
return playQueue; return playQueue;
} }

12
app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
View file

@ -38,12 +38,12 @@ public final class PlayerHolder {
private static final boolean DEBUG = MainActivity.DEBUG; private static final boolean DEBUG = MainActivity.DEBUG;
private static final String TAG = PlayerHolder.class.getSimpleName(); private static final String TAG = PlayerHolder.class.getSimpleName();
private PlayerServiceExtendedEventListener listener; @Nullable private PlayerServiceExtendedEventListener listener;
private final PlayerServiceConnection serviceConnection = new PlayerServiceConnection(); private final PlayerServiceConnection serviceConnection = new PlayerServiceConnection();
private boolean bound; private boolean bound;
private MainPlayer playerService; @Nullable private MainPlayer playerService;
private Player player; @Nullable private Player player;
/** /**
* Returns the current {@link MainPlayer.PlayerType} of the {@link MainPlayer} service, * Returns the current {@link MainPlayer.PlayerType} of the {@link MainPlayer} service,
@ -75,7 +75,11 @@ public final class PlayerHolder {
} }
public int getQueueSize() { public int getQueueSize() {
return isPlayerOpen() ? player.getPlayQueue().size() : 0; if (player == null || player.getPlayQueue() == null) {
// player play queue might be null e.g. while player is starting
return 0;
}
return player.getPlayQueue().size();
} }
public void setListener(@Nullable final PlayerServiceExtendedEventListener newListener) { public void setListener(@Nullable final PlayerServiceExtendedEventListener newListener) {