X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/591c0fe8a3744608575a6dcb1f6f4f9f818948d2..11c90fa0324347bf2b7ba56855ccd45898141569:/src/main/java/org/asamk/signal/util/Hex.java

diff --git a/src/main/java/org/asamk/signal/util/Hex.java b/src/main/java/org/asamk/signal/util/Hex.java
index 46609ceb..596f23a9 100644
--- a/src/main/java/org/asamk/signal/util/Hex.java
+++ b/src/main/java/org/asamk/signal/util/Hex.java
@@ -8,17 +8,22 @@ public class Hex {
     }
 
     public static String toString(byte[] bytes) {
-        StringBuffer buf = new StringBuffer();
-        for (final byte aByte : bytes) {
+        if (bytes.length == 0) {
+            return "";
+        }
+
+        var buf = new StringBuffer();
+        for (final var aByte : bytes) {
             appendHexChar(buf, aByte);
             buf.append(" ");
         }
+        buf.deleteCharAt(buf.length() - 1);
         return buf.toString();
     }
 
     public static String toStringCondensed(byte[] bytes) {
-        StringBuffer buf = new StringBuffer();
-        for (final byte aByte : bytes) {
+        var buf = new StringBuffer();
+        for (final var aByte : bytes) {
             appendHexChar(buf, aByte);
         }
         return buf.toString();
@@ -30,9 +35,9 @@ public class Hex {
     }
 
     public static byte[] toByteArray(String s) {
-        int len = s.length();
-        byte[] data = new byte[len / 2];
-        for (int i = 0; i < len; i += 2) {
+        var len = s.length();
+        var data = new byte[len / 2];
+        for (var i = 0; i < len; i += 2) {
             data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4) + Character.digit(s.charAt(i + 1), 16));
         }
         return data;