Handle null player_options_override (#254)

Author: devgianlu

lib/src/main/java/xyz/gianlu/librespot/common/ProtoUtils.java

@@ -181,12 +181,14 @@ public static Player.PlayOrigin convertPlayOrigin(@Nullable PlayOrigin po) {
 
 
     @NotNull
-    public static ContextPlayerOptions jsonToPlayerOptions(@NotNull JsonObject obj, @Nullable ContextPlayerOptions old) {
+    public static ContextPlayerOptions jsonToPlayerOptions(@Nullable JsonObject obj, @Nullable ContextPlayerOptions old) {
         ContextPlayerOptions.Builder builder = old == null ? ContextPlayerOptions.newBuilder() : old.toBuilder();
 
-        Optional.ofNullable(obj.get("repeating_context")).ifPresent(elm -> builder.setRepeatingContext(elm.getAsBoolean()));
-        Optional.ofNullable(obj.get("repeating_track")).ifPresent(elm -> builder.setRepeatingTrack(elm.getAsBoolean()));
-        Optional.ofNullable(obj.get("shuffling_context")).ifPresent(elm -> builder.setShufflingContext(elm.getAsBoolean()));
+        if (obj != null) {
+            Optional.ofNullable(obj.get("repeating_context")).ifPresent(elm -> builder.setRepeatingContext(elm.getAsBoolean()));
+            Optional.ofNullable(obj.get("repeating_track")).ifPresent(elm -> builder.setRepeatingTrack(elm.getAsBoolean()));
+            Optional.ofNullable(obj.get("shuffling_context")).ifPresent(elm -> builder.setShufflingContext(elm.getAsBoolean()));
+        }
 
         return builder.build();
     }

player/src/main/java/xyz/gianlu/librespot/player/state/DeviceStateHandler.java

@@ -323,7 +323,7 @@ public static JsonObject getContext(@NotNull JsonObject obj) {
             return obj.getAsJsonObject("context");
         }
 
-        @NotNull
+        @Nullable
         public static JsonObject getPlayerOptionsOverride(@NotNull JsonObject obj) {
             return obj.getAsJsonObject("options").getAsJsonObject("player_options_override");
         }