Utils#hexToBytes

Author: devgianlu

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

@@ -151,6 +151,14 @@ public static String[] split(@NotNull String str, char c) {
         return split;
     }
 
+    public static byte[] hexToBytes(@NotNull String str) {
+        int len = str.length();
+        byte[] data = new byte[len / 2];
+        for (int i = 0; i < len; i += 2)
+            data[i / 2] = (byte) ((Character.digit(str.charAt(i), 16) << 4) + Character.digit(str.charAt(i + 1), 16));
+        return data;
+    }
+
     @NotNull
     public static byte[] toByteArray(@NotNull BigInteger i) {
         byte[] array = i.toByteArray();
@@ -166,7 +174,7 @@ public static byte[] toByteArray(int i) {
     }
 
     @NotNull
-    public static String bytesToHex(ByteString bytes) {
+    public static String bytesToHex(@NotNull ByteString bytes) {
         return bytesToHex(bytes.toByteArray());
     }
 

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

@@ -4,7 +4,6 @@
 import org.jetbrains.annotations.NotNull;
 import xyz.gianlu.librespot.common.Utils;
 
-import java.math.BigInteger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -48,6 +47,6 @@ public static AlbumId fromHex(@NotNull String hex) {
 
     @Override
     public @NotNull String toSpotifyUri() {
-        return "spotify:album:" + new String(BASE62.encode(new BigInteger(hexId, 16).toByteArray()));
+        return "spotify:album:" + new String(BASE62.encode(Utils.hexToBytes(hexId)));
     }
 }

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

@@ -4,7 +4,6 @@
 import org.jetbrains.annotations.NotNull;
 import xyz.gianlu.librespot.common.Utils;
 
-import java.math.BigInteger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -48,6 +47,6 @@ public static ArtistId fromHex(@NotNull String hex) {
 
     @Override
     public @NotNull String toSpotifyUri() {
-        return "spotify:artist:" + new String(BASE62.encode(new BigInteger(hexId, 16).toByteArray()));
+        return "spotify:artist:" + new String(BASE62.encode(Utils.hexToBytes(hexId)));
     }
 }

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

@@ -5,7 +5,6 @@
 import xyz.gianlu.librespot.common.Utils;
 import xyz.gianlu.librespot.common.proto.Spirc;
 
-import java.math.BigInteger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -40,7 +39,7 @@ public static TrackId fromBase62(@NotNull String base62) {
     @NotNull
     public static TrackId fromTrackRef(@NotNull Spirc.TrackRef ref) {
         if (ref.hasGid()) {
-            return new TrackId(Utils.bytesToHex(ref.getGid().toByteArray()));
+            return new TrackId(Utils.bytesToHex(ref.getGid()));
         } else if (ref.hasUri()) {
             return fromUri(ref.getUri());
         } else {
@@ -60,10 +59,10 @@ public static TrackId fromHex(@NotNull String hex) {
 
     @Override
     public @NotNull String toSpotifyUri() {
-        return "spotify:track:" + new String(BASE62.encode(new BigInteger(hexId, 16).toByteArray()));
+        return "spotify:track:" + new String(BASE62.encode(Utils.hexToBytes(hexId)));
     }
 
     public byte[] getGid() {
-        return Utils.toByteArray(new BigInteger(hexId, 16));
+        return Utils.hexToBytes(hexId);
     }
 }

core/src/main/java/xyz/gianlu/librespot/player/CacheManager.java

@@ -178,7 +178,7 @@ private class CacheEntry {
 
             CacheEntry(@NotNull String hexId, byte[] headersId, byte[][] headersData, short chunksSize) {
                 this.hexId = hexId;
-                this.gid = ByteString.copyFrom(new BigInteger(hexId, 16).toByteArray());
+                this.gid = ByteString.copyFrom(Utils.hexToBytes(hexId));
                 this.headersId = headersId;
                 this.headersData = headersData;
                 this.chunks = new boolean[chunksSize];