Fixed NPE when publishing event

Author: devgianlu

core/src/main/java/xyz/gianlu/librespot/player/Player.java

@@ -115,7 +115,6 @@ public void load(@NotNull String uri, boolean play) {
         }
 
         events.dispatchContextChanged();
-        events.dispatchTrackChanged();
         loadTrack(play, PushToMixerReason.None);
     }
 
@@ -135,7 +134,6 @@ private void transferState(TransferStateOuterClass.@NotNull TransferState cmd) {
         }
 
         events.dispatchContextChanged();
-        events.dispatchTrackChanged();
         loadTrack(!cmd.getPlayback().getIsPaused(), PushToMixerReason.None);
     }
 
@@ -155,7 +153,6 @@ private void handleLoad(@NotNull JsonObject obj) {
         }
 
         events.dispatchContextChanged();
-        events.dispatchTrackChanged();
 
         Boolean play = PlayCommandHelper.isInitiallyPaused(obj);
         if (play == null) play = true;
@@ -422,6 +419,8 @@ private void loadTrack(boolean play, @NotNull PushToMixerReason reason) {
                 state.updated();
             }
 
+            events.dispatchTrackChanged();
+
             if (!play) {
                 runner.pauseMixer();
                 events.dispatchPlaybackPaused();
@@ -449,6 +448,8 @@ private void loadTrack(boolean play, @NotNull PushToMixerReason reason) {
                 state.updated();
             }
 
+            events.dispatchTrackChanged();
+
             if (play) {
                 trackHandler.pushToMixer(reason);
                 runner.playMixer();
@@ -530,7 +531,6 @@ private void handleNext(@Nullable JsonObject obj) {
 
         if (track != null) {
             state.skipTo(track);
-            events.dispatchTrackChanged();
             loadTrack(true, PushToMixerReason.Next);
             return;
         }
@@ -543,7 +543,6 @@ private void handleNext(@Nullable JsonObject obj) {
 
         if (next.isOk()) {
             state.setPosition(0);
-            events.dispatchTrackChanged();
             loadTrack(next == NextPlayable.OK_PLAY || next == NextPlayable.OK_REPEAT, PushToMixerReason.Next);
         } else {
             LOGGER.fatal("Failed loading next song: " + next);
@@ -569,7 +568,6 @@ private void loadAutoplay() {
                 state.setContextMetadata("context_description", contextDesc);
 
                 events.dispatchContextChanged();
-                events.dispatchTrackChanged();
                 loadTrack(true, PushToMixerReason.None);
 
                 LOGGER.debug(String.format("Loading context for autoplay, uri: %s", newContext));
@@ -579,7 +577,6 @@ private void loadAutoplay() {
                 state.setContextMetadata("context_description", contextDesc);
 
                 events.dispatchContextChanged();
-                events.dispatchTrackChanged();
                 loadTrack(true, PushToMixerReason.None);
 
                 LOGGER.debug(String.format("Loading context for autoplay (using radio-apollo), uri: %s", state.getContextUri()));
@@ -604,7 +601,6 @@ private void handlePrev() {
             StateWrapper.PreviousPlayable prev = state.previousPlayable();
             if (prev.isOk()) {
                 state.setPosition(0);
-                events.dispatchTrackChanged();
                 loadTrack(true, PushToMixerReason.Prev);
             } else {
                 LOGGER.fatal("Failed loading previous song: " + prev);
@@ -732,7 +728,7 @@ void dispatchTrackChanged() {
 
             Metadata.Track track;
             Metadata.Episode episode;
-            if (trackHandler.isPlayable(id)) {
+            if (trackHandler != null && trackHandler.isPlayable(id)) {
                 track = trackHandler.track();
                 episode = trackHandler.episode();
             } else {