Avoid trying to match tracks on empty URI or UID

librespot-org · Dec 22, 2020 · abde6b6 · abde6b6
1 parent 07dc74d
commit abde6b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/src/main/java/xyz/gianlu/librespot/common/ProtoUtils.java b/lib/src/main/java/xyz/gianlu/librespot/common/ProtoUtils.java
@@ -262,7 +262,7 @@ public static boolean isQueued(@NotNull ContextTrack track) {
     }
 
     public static void enrichTrack(@NotNull ContextTrack.Builder subject, @NotNull ContextTrack track) {
-        if (subject.hasUri() && track.hasUri() && !Objects.equals(subject.getUri(), track.getUri()))
+        if (subject.hasUri() && track.hasUri() && !subject.getUri().isEmpty() && !track.getUri().isEmpty() && !Objects.equals(subject.getUri(), track.getUri()))
             throw new IllegalArgumentException(subject.getUri() + " is not " + track.getUri());
 
         if (subject.hasGid() && track.hasGid() && !Objects.equals(subject.getGid(), track.getGid()))
@@ -272,7 +272,7 @@ public static void enrichTrack(@NotNull ContextTrack.Builder subject, @NotNull C
     }
 
     public static void enrichTrack(@NotNull Player.ProvidedTrack.Builder subject, @NotNull ContextTrack track) {
-        if (track.hasUri() && !Objects.equals(subject.getUri(), track.getUri()))
+        if (track.hasUri() && !track.getUri().isEmpty() && !Objects.equals(subject.getUri(), track.getUri()))
             throw new IllegalArgumentException(subject.getUri() + " is not " + track.getUri());
 
         subject.putAllMetadata(track.getMetadataMap());

diff --git a/player/src/main/java/xyz/gianlu/librespot/player/StateWrapper.java b/player/src/main/java/xyz/gianlu/librespot/player/StateWrapper.java
@@ -497,9 +497,9 @@ String load(@NotNull JsonObject obj) throws AbsSpotifyContext.UnsupportedContext
         Integer trackIndex = PlayCommandHelper.getSkipToIndex(obj);
 
         try {
-            if (trackUri != null) {
+            if (trackUri != null && !trackUri.isEmpty()) {
                 tracksKeeper.initializeFrom(tracks -> ProtoUtils.indexOfTrackByUri(tracks, trackUri), null, null);
-            } else if (trackUid != null) {
+            } else if (trackUid != null && !trackUid.isEmpty()) {
                 tracksKeeper.initializeFrom(tracks -> ProtoUtils.indexOfTrackByUid(tracks, trackUid), null, null);
             } else if (trackIndex != null) {
                 tracksKeeper.initializeFrom(tracks -> {