Add toString method to Hex utils

diff --git a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
index dd3e5e46be71793720dc750bc887eb8ac86f7e20..a7cf8705331a298ff2e5d367f982b1225b78587a 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
@@ -18,7 +18,7 @@ public class ListIdentitiesCommand implements LocalCommand {
     private static void printIdentityFingerprint(Manager m, String theirUsername, JsonIdentityKeyStore.Identity theirId) {
         String digits = Util.formatSafetyNumber(m.computeSafetyNumber(theirUsername, theirId.getIdentityKey()));
         System.out.println(String.format("%s: %s Added: %s Fingerprint: %s Safety Number: %s", theirUsername,
     private static void printIdentityFingerprint(Manager m, String theirUsername, JsonIdentityKeyStore.Identity theirId) {
         String digits = Util.formatSafetyNumber(m.computeSafetyNumber(theirUsername, theirId.getIdentityKey()));
         System.out.println(String.format("%s: %s Added: %s Fingerprint: %s Safety Number: %s", theirUsername,

-                theirId.getTrustLevel(), theirId.getDateAdded(), Hex.toStringCondensed(theirId.getFingerprint()), digits));
+                theirId.getTrustLevel(), theirId.getDateAdded(), Hex.toString(theirId.getFingerprint()), digits));

     }
 
     @Override
     }
 
     @Override

diff --git a/src/main/java/org/asamk/signal/util/Hex.java b/src/main/java/org/asamk/signal/util/Hex.java
index 95b2d26ffa1405a7141f4de76b69bbac5e2d7b16..8c6c62a2af5ae0bf43bea1f158f91f5d21f2b694 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Hex.java
+++ b/src/main/java/org/asamk/signal/util/Hex.java
@@ -9,6 +9,15 @@ public class Hex {
     private Hex() {
     }
 
     private Hex() {
     }
 

+    public static String toString(byte[] bytes) {
+        StringBuffer buf = new StringBuffer();
+        for (final byte aByte : bytes) {
+            appendHexChar(buf, aByte);
+            buf.append(" ");
+        }
+        return buf.toString();
+    }
+

     public static String toStringCondensed(byte[] bytes) {
         StringBuffer buf = new StringBuffer();
         for (final byte aByte : bytes) {
     public static String toStringCondensed(byte[] bytes) {
         StringBuffer buf = new StringBuffer();
         for (final byte aByte : bytes) {


@@ -20,7 +29,6 @@ public class Hex {
     private static void appendHexChar(StringBuffer buf, int b) {
         buf.append(HEX_DIGITS[(b >> 4) & 0xf]);
         buf.append(HEX_DIGITS[b & 0xf]);
     private static void appendHexChar(StringBuffer buf, int b) {
         buf.append(HEX_DIGITS[(b >> 4) & 0xf]);
         buf.append(HEX_DIGITS[b & 0xf]);

-        buf.append(" ");

     }
 
     public static byte[] toByteArray(String s) {
     }
 
     public static byte[] toByteArray(String s) {