From 5108d75682bf5cbb142ca4be8796daab02b9fb3f Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Tue, 25 Jan 2022 17:37:15 +0100
Subject: [PATCH] Fix NPE and add some `@Nullable`s

Fix NullPointerException in PlayerHolder.getQueueSize() and add `@Nullable` here and there so that the linter reports risks of NPEs
---
 .../main/java/org/schabi/newpipe/player/Player.java  |  4 +++-
 .../schabi/newpipe/player/helper/PlayerHolder.java   | 12 ++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/player/Player.java b/app/src/main/java/org/schabi/newpipe/player/Player.java
index 81ef25db1..c002ba16d 100644
--- a/app/src/main/java/org/schabi/newpipe/player/Player.java
+++ b/app/src/main/java/org/schabi/newpipe/player/Player.java
@@ -260,7 +260,8 @@ public final class Player implements
     // Playback
     //////////////////////////////////////////////////////////////////////////*/
 
-    private PlayQueue playQueue;
+    // play queue might be null e.g. while player is starting
+    @Nullable private PlayQueue playQueue;
     private PlayQueueAdapter playQueueAdapter;
     private StreamSegmentAdapter segmentAdapter;
 
@@ -4202,6 +4203,7 @@ public final class Player implements
     }
 
 
+    @Nullable
     public PlayQueue getPlayQueue() {
         return playQueue;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
index 10e315667..42865564a 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java
@@ -38,12 +38,12 @@ public final class PlayerHolder {
     private static final boolean DEBUG = MainActivity.DEBUG;
     private static final String TAG = PlayerHolder.class.getSimpleName();
 
-    private PlayerServiceExtendedEventListener listener;
+    @Nullable private PlayerServiceExtendedEventListener listener;
 
     private final PlayerServiceConnection serviceConnection = new PlayerServiceConnection();
     private boolean bound;
-    private MainPlayer playerService;
-    private Player player;
+    @Nullable private MainPlayer playerService;
+    @Nullable private Player player;
 
     /**
      * Returns the current {@link MainPlayer.PlayerType} of the {@link MainPlayer} service,
@@ -75,7 +75,11 @@ public final class PlayerHolder {
     }
 
     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) {