Skip to content

Commit 8f19c2f

Browse files
committed
Catching more empty URIs + log request body at TRACE level
1 parent abde6b6 commit 8f19c2f

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ public static Player.ProvidedTrack convertToProvidedTrack(@Nullable ContextTrack
285285

286286
Player.ProvidedTrack.Builder builder = Player.ProvidedTrack.newBuilder();
287287
builder.setProvider("context");
288-
if (track.hasUri()) builder.setUri(track.getUri());
288+
if (track.hasUri() && !track.getUri().isEmpty()) builder.setUri(track.getUri());
289289
if (track.hasUid()) builder.setUid(track.getUid());
290290

291291
try {

lib/src/main/java/xyz/gianlu/librespot/dealer/DealerClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private void handleRequest(@NotNull JsonObject obj) {
9494
String sender = payload.get("sent_by_device_id").getAsString();
9595

9696
JsonObject command = payload.getAsJsonObject("command");
97-
LOGGER.trace("Received request. {mid: {}, key: {}, pid: {}, sender: {}}", mid, key, pid, sender);
97+
LOGGER.trace("Received request. {mid: {}, key: {}, pid: {}, sender: {}, command: {}}", mid, key, pid, sender, command);
9898

9999
boolean interesting = false;
100100
synchronized (reqListeners) {

lib/src/main/java/xyz/gianlu/librespot/metadata/PlayableId.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.spotify.connectstate.Player;
55
import com.spotify.metadata.Metadata;
66
import org.jetbrains.annotations.NotNull;
7+
import org.jetbrains.annotations.Nullable;
78
import xyz.gianlu.librespot.common.Utils;
89

910
import java.util.Arrays;
@@ -50,9 +51,9 @@ static boolean canPlaySomething(@NotNull List<ContextTrack> tracks) {
5051
return false;
5152
}
5253

53-
@NotNull
54+
@Nullable
5455
static PlayableId from(@NotNull Player.ProvidedTrack track) {
55-
return fromUri(track.getUri());
56+
return track.getUri().isEmpty() ? null : fromUri(track.getUri());
5657
}
5758

5859
static boolean isSupported(@NotNull String uri) {

0 commit comments

Comments
 (0)