Infer URI of ProvidedTracks too (#281)

Author: devgianlu

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

@@ -292,14 +292,19 @@ public static void enrichTrack(@NotNull Player.ProvidedTrack.Builder subject, @N
     }
 
     @Nullable
-    @Contract("null -> null")
-    public static Player.ProvidedTrack toProvidedTrack(@Nullable ContextTrack track) {
+    @Contract("null, _ -> null")
+    public static Player.ProvidedTrack toProvidedTrack(@Nullable ContextTrack track, String contextUri) {
         if (track == null) return null;
 
         Player.ProvidedTrack.Builder builder = Player.ProvidedTrack.newBuilder();
         builder.setProvider("context");
-        if (track.hasUri() && !track.getUri().isEmpty()) builder.setUri(track.getUri());
         if (track.hasUid()) builder.setUid(track.getUid());
+        if (track.hasUri() && !track.getUri().isEmpty()) {
+            builder.setUri(track.getUri());
+        } else if (track.hasGid()) {
+            String uriPrefix = PlayableId.inferUriPrefix(contextUri);
+            builder.setUri(uriPrefix + new String(PlayableId.BASE62.encode(track.getGid().toByteArray(), 22)));
+        }
 
         try {
             builder.setAlbumUri(track.getMetadataOrThrow("album_uri"));

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

@@ -930,14 +930,14 @@ private void updatePrevNextTracks() {
 
             state.clearPrevTracks();
             for (int i = Math.max(0, index - MAX_PREV_TRACKS); i < index; i++)
-                state.addPrevTracks(ProtoUtils.toProvidedTrack(tracks.get(i)));
+                state.addPrevTracks(ProtoUtils.toProvidedTrack(tracks.get(i), getContextUri()));
 
             state.clearNextTracks();
             for (ContextTrack track : queue)
-                state.addNextTracks(ProtoUtils.toProvidedTrack(track));
+                state.addNextTracks(ProtoUtils.toProvidedTrack(track, getContextUri()));
 
             for (int i = index + 1; i < Math.min(tracks.size(), index + 1 + MAX_NEXT_TRACKS); i++)
-                state.addNextTracks(ProtoUtils.toProvidedTrack(tracks.get(i)));
+                state.addNextTracks(ProtoUtils.toProvidedTrack(tracks.get(i), getContextUri()));
         }
 
         void updateTrackDuration(int duration) {
@@ -976,8 +976,8 @@ private void updateLikeDislike() {
          * <b>This will also REMOVE a track from the queue if needed. Calling this twice will break the queue.</b>
          */
         private void updateState() {
-            if (isPlayingQueue) state.setTrack(ProtoUtils.toProvidedTrack(queue.remove()));
-            else state.setTrack(ProtoUtils.toProvidedTrack(tracks.get(getCurrentTrackIndex())));
+            if (isPlayingQueue) state.setTrack(ProtoUtils.toProvidedTrack(queue.remove(), getContextUri()));
+            else state.setTrack(ProtoUtils.toProvidedTrack(tracks.get(getCurrentTrackIndex()), getContextUri()));
 
             updateLikeDislike();
 
@@ -1116,7 +1116,7 @@ private void enrichCurrentTrack(@NotNull ContextTrack track) {
                 ContextTrack.Builder current = tracks.get(index).toBuilder();
                 ProtoUtils.enrichTrack(current, track);
                 tracks.set(index, current.build());
-                state.setTrack(ProtoUtils.toProvidedTrack(current.build()));
+                state.setTrack(ProtoUtils.toProvidedTrack(current.build(), getContextUri()));
             }
         }