Revert "Avoid NPE with metrics + catch 400 when loading autoplay (#284)"

This reverts commit 1bcb832

Author: devgianlu

lib/src/main/java/xyz/gianlu/librespot/mercury/MercuryClient.java

@@ -347,11 +347,8 @@ void dispatch(@NotNull Response resp) {
     }
 
     public static class MercuryException extends Exception {
-        public final int code;
-
         private MercuryException(@NotNull Response response) {
             super(String.format("status: %d", response.statusCode));
-            this.code = response.statusCode;
         }
     }
 

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

@@ -54,10 +54,10 @@ public class Player implements Closeable, DeviceStateHandler.Listener, PlayerSes
     private final PlayerConfiguration conf;
     private final EventsDispatcher events;
     private final AudioSink sink;
-    private final Map<String, PlaybackMetrics> metrics = new HashMap<>(5);
     private StateWrapper state;
     private PlayerSession playerSession;
     private ScheduledFuture<?> releaseLineFuture = null;
+    private Map<String, PlaybackMetrics> metrics = new HashMap<>(5);
 
     public Player(@NotNull PlayerConfiguration conf, @NotNull Session session) {
         this.conf = conf;
@@ -207,7 +207,7 @@ private void panicState(@Nullable PlaybackMetrics.Reason reason) {
         state.updated();
 
         if (reason == null) {
-            metrics.clear();
+            metrics = null;
         } else if (playerSession != null) {
             endMetrics(playerSession.currentPlaybackId(), reason, playerSession.currentMetrics(), state.getPosition());
         }
@@ -501,6 +501,14 @@ private void loadAutoplay() {
             return;
         }
 
+        if (context.startsWith("spotify:search:")) {
+            LOGGER.info("Cannot load autoplay for search context: " + context);
+
+            state.setPosition(0);
+            state.setState(true, false, false);
+            state.updated();
+            return;
+        }
 
         String contextDesc = state.getContextMetadata("context_description");
 
@@ -532,16 +540,8 @@ private void loadAutoplay() {
                 state.updated();
             }
         } catch (IOException | MercuryClient.MercuryException ex) {
-            if (ex instanceof MercuryClient.MercuryException && ((MercuryClient.MercuryException) ex).code == 400) {
-                LOGGER.info("Cannot load autoplay for search context: " + context);
-
-                state.setPosition(0);
-                state.setState(true, true, false);
-                state.updated();
-            } else {
-                LOGGER.fatal("Failed loading autoplay station!", ex);
-                panicState(null);
-            }
+            LOGGER.fatal("Failed loading autoplay station!", ex);
+            panicState(null);
         } catch (AbsSpotifyContext.UnsupportedContextException ex) {
             LOGGER.fatal("Cannot play local tracks!", ex);
             panicState(null);