@@ -114,9 +114,9 @@ public void load(@NotNull String uri, boolean play) {
114114 return ;
115115 }
116116
117- loadTrack (play , PushToMixerReason .None );
118117 events .dispatchContextChanged ();
119118 events .dispatchTrackChanged ();
119+ loadTrack (play , PushToMixerReason .None );
120120 }
121121
122122 private void transferState (TransferStateOuterClass .@ NotNull TransferState cmd ) {
@@ -134,9 +134,9 @@ private void transferState(TransferStateOuterClass.@NotNull TransferState cmd) {
134134 return ;
135135 }
136136
137- loadTrack (!cmd .getPlayback ().getIsPaused (), PushToMixerReason .None );
138137 events .dispatchContextChanged ();
139138 events .dispatchTrackChanged ();
139+ loadTrack (!cmd .getPlayback ().getIsPaused (), PushToMixerReason .None );
140140 }
141141
142142 private void handleLoad (@ NotNull JsonObject obj ) {
@@ -154,12 +154,12 @@ private void handleLoad(@NotNull JsonObject obj) {
154154 return ;
155155 }
156156
157+ events .dispatchContextChanged ();
158+ events .dispatchTrackChanged ();
159+
157160 Boolean play = PlayCommandHelper .isInitiallyPaused (obj );
158161 if (play == null ) play = true ;
159162 loadTrack (play , PushToMixerReason .None );
160-
161- events .dispatchContextChanged ();
162- events .dispatchTrackChanged ();
163163 }
164164
165165 @ Override
@@ -530,8 +530,8 @@ private void handleNext(@Nullable JsonObject obj) {
530530
531531 if (track != null ) {
532532 state .skipTo (track );
533- loadTrack (true , PushToMixerReason .Next );
534533 events .dispatchTrackChanged ();
534+ loadTrack (true , PushToMixerReason .Next );
535535 return ;
536536 }
537537
@@ -543,8 +543,8 @@ private void handleNext(@Nullable JsonObject obj) {
543543
544544 if (next .isOk ()) {
545545 state .setPosition (0 );
546- loadTrack (next == NextPlayable .OK_PLAY || next == NextPlayable .OK_REPEAT , PushToMixerReason .Next );
547546 events .dispatchTrackChanged ();
547+ loadTrack (next == NextPlayable .OK_PLAY || next == NextPlayable .OK_REPEAT , PushToMixerReason .Next );
548548 } else {
549549 LOGGER .fatal ("Failed loading next song: " + next );
550550 panicState ();
@@ -568,19 +568,19 @@ private void loadAutoplay() {
568568 state .loadContext (newContext );
569569 state .setContextMetadata ("context_description" , contextDesc );
570570
571- loadTrack (true , PushToMixerReason .None );
572571 events .dispatchContextChanged ();
573572 events .dispatchTrackChanged ();
573+ loadTrack (true , PushToMixerReason .None );
574574
575575 LOGGER .debug (String .format ("Loading context for autoplay, uri: %s" , newContext ));
576576 } else if (resp .statusCode == 204 ) {
577577 MercuryRequests .StationsWrapper station = session .mercury ().sendSync (MercuryRequests .getStationFor (context ));
578578 state .loadContextWithTracks (station .uri (), station .tracks ());
579579 state .setContextMetadata ("context_description" , contextDesc );
580580
581- loadTrack (true , PushToMixerReason .None );
582581 events .dispatchContextChanged ();
583582 events .dispatchTrackChanged ();
583+ loadTrack (true , PushToMixerReason .None );
584584
585585 LOGGER .debug (String .format ("Loading context for autoplay (using radio-apollo), uri: %s" , state .getContextUri ()));
586586 } else {
@@ -604,8 +604,8 @@ private void handlePrev() {
604604 StateWrapper .PreviousPlayable prev = state .previousPlayable ();
605605 if (prev .isOk ()) {
606606 state .setPosition (0 );
607- loadTrack (true , PushToMixerReason .Prev );
608607 events .dispatchTrackChanged ();
608+ loadTrack (true , PushToMixerReason .Prev );
609609 } else {
610610 LOGGER .fatal ("Failed loading previous song: " + prev );
611611 panicState ();
0 commit comments