Small improvements

[signal-cli] / 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 8c6c62a2af5ae0bf43bea1f158f91f5d21f2b694..f7a870ca13ff940fdc2db00eec3a4fc01296f380 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Hex.java
+++ b/src/main/java/org/asamk/signal/util/Hex.java
@@ -10,17 +10,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();
@@ -32,9 +37,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;