Fixed #79

Author: devgianlu

common/src/main/java/xyz/gianlu/librespot/common/Utils.java

@@ -202,16 +202,21 @@ public static String bytesToHex(@NotNull ByteString bytes) {
 
     @NotNull
     public static String bytesToHex(byte[] bytes) {
-        return bytesToHex(bytes, 0, bytes.length, false);
+        return bytesToHex(bytes, 0, bytes.length, false, -1);
     }
 
     @NotNull
     public static String bytesToHex(byte[] bytes, boolean trim) {
-        return bytesToHex(bytes, 0, bytes.length, trim);
+        return bytesToHex(bytes, 0, bytes.length, trim, -1);
     }
 
     @NotNull
-    public static String bytesToHex(byte[] bytes, int offset, int length, boolean trim) {
+    public static String bytesToHex(byte[] bytes, boolean trim, int minLength) {
+        return bytesToHex(bytes, 0, bytes.length, trim, minLength);
+    }
+
+    @NotNull
+    public static String bytesToHex(byte[] bytes, int offset, int length, boolean trim, int minLength) {
         if (bytes == null) return "";
 
         int newOffset = 0;
@@ -221,7 +226,11 @@ public static String bytesToHex(byte[] bytes, int offset, int length, boolean tr
             int v = bytes[j] & 0xFF;
             if (trimming) {
                 if (v == 0) {
-                    newOffset = j  + 1;
+                    newOffset = j + 1;
+
+                    if (minLength != -1 && length - newOffset == minLength)
+                        trimming = false;
+
                     continue;
                 } else {
                     trimming = false;

core/src/main/java/xyz/gianlu/librespot/mercury/model/AlbumId.java

@@ -24,15 +24,15 @@ public static AlbumId fromUri(@NotNull String uri) {
         Matcher matcher = PATTERN.matcher(uri);
         if (matcher.find()) {
             String id = matcher.group(1);
-            return new AlbumId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true));
+            return new AlbumId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true, 16));
         } else {
             throw new IllegalArgumentException("Not a Spotify album ID: " + uri);
         }
     }
 
     @NotNull
     public static AlbumId fromBase62(@NotNull String base62) {
-        return new AlbumId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true));
+        return new AlbumId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true, 16));
     }
 
     @NotNull

core/src/main/java/xyz/gianlu/librespot/mercury/model/ArtistId.java

@@ -24,15 +24,15 @@ public static ArtistId fromUri(@NotNull String uri) {
         Matcher matcher = PATTERN.matcher(uri);
         if (matcher.find()) {
             String id = matcher.group(1);
-            return new ArtistId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true));
+            return new ArtistId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true, 16));
         } else {
             throw new IllegalArgumentException("Not a Spotify artist ID: " + uri);
         }
     }
 
     @NotNull
     public static ArtistId fromBase62(@NotNull String base62) {
-        return new ArtistId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true));
+        return new ArtistId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true, 16));
     }
 
     @NotNull

core/src/main/java/xyz/gianlu/librespot/mercury/model/EpisodeId.java

@@ -25,7 +25,7 @@ public static EpisodeId fromUri(@NotNull String uri) {
         Matcher matcher = PATTERN.matcher(uri);
         if (matcher.find()) {
             String id = matcher.group(1);
-            return new EpisodeId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true));
+            return new EpisodeId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true, 16));
         } else {
             throw new IllegalArgumentException("Not a Spotify episode ID: " + uri);
         }
@@ -44,7 +44,7 @@ public static EpisodeId fromTrackRef(@NotNull Spirc.TrackRef ref) {
 
     @NotNull
     public static EpisodeId fromBase62(@NotNull String base62) {
-        return new EpisodeId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true));
+        return new EpisodeId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true, 16));
     }
 
     @NotNull

core/src/main/java/xyz/gianlu/librespot/mercury/model/ShowId.java

@@ -24,15 +24,15 @@ public static ShowId fromUri(@NotNull String uri) {
         Matcher matcher = PATTERN.matcher(uri);
         if (matcher.find()) {
             String id = matcher.group(1);
-            return new ShowId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true));
+            return new ShowId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true, 16));
         } else {
             throw new IllegalArgumentException("Not a Spotify show ID: " + uri);
         }
     }
 
     @NotNull
     public static ShowId fromBase62(@NotNull String base62) {
-        return new ShowId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true));
+        return new ShowId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true, 16));
     }
 
     @NotNull

core/src/main/java/xyz/gianlu/librespot/mercury/model/TrackId.java

@@ -25,15 +25,15 @@ public static TrackId fromUri(@NotNull String uri) {
         Matcher matcher = PATTERN.matcher(uri);
         if (matcher.find()) {
             String id = matcher.group(1);
-            return new TrackId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true));
+            return new TrackId(Utils.bytesToHex(BASE62.decode(id.getBytes()), true, 16));
         } else {
             throw new IllegalArgumentException("Not a Spotify track ID: " + uri);
         }
     }
 
     @NotNull
     public static TrackId fromBase62(@NotNull String base62) {
-        return new TrackId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true));
+        return new TrackId(Utils.bytesToHex(BASE62.decode(base62.getBytes()), true, 16));
     }
 
     @NotNull