Update libsignal-service-java

[signal-cli] / src / main / java / org / asamk / signal / util / Util.java

diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index 31c6b68e987316ed9bdac52db7655abd01eb1bee..b4954bf3226d6075b907d9696f0df157d1b855bf 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 

-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupIdFormatException;

 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 


@@ -45,21 +43,24 @@ public class Util {
     }
 
     public static String formatSafetyNumber(String digits) {
     }
 
     public static String formatSafetyNumber(String digits) {

+        if (digits == null) {
+            return null;
+        }
+

         final var partCount = 12;
         var partSize = digits.length() / partCount;
         var f = new StringBuilder(digits.length() + partCount);
         for (var i = 0; i < partCount; i++) {
         final var partCount = 12;
         var partSize = digits.length() / partCount;
         var f = new StringBuilder(digits.length() + partCount);
         for (var i = 0; i < partCount; i++) {

-            f.append(digits, i * partSize, (i * partSize) + partSize).append(" ");
+            f.append(digits, i * partSize, (i * partSize) + partSize);
+            if (i != partCount - 1) {
+                f.append(" ");
+            }

         }
         return f.toString();
     }
 
         }
         return f.toString();
     }
 

-    public static GroupId decodeGroupId(String groupId) throws GroupIdFormatException {
-        return GroupId.fromBase64(groupId);
-    }
-

     public static String getLegacyIdentifier(final SignalServiceAddress address) {
     public static String getLegacyIdentifier(final SignalServiceAddress address) {

-        return address.getNumber().or(() -> address.getUuid().get().toString());
+        return address.getNumber().or(() -> address.getUuid().toString());

     }
 
     public static ObjectMapper createJsonObjectMapper() {
     }
 
     public static ObjectMapper createJsonObjectMapper() {