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 e798d53798286b775ae30398ee653b6128115b17..a9d2bb8fa14533b6c34bcab2c6c006f68ba53efe 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -3,6 +3,7 @@ package org.asamk.signal.util;
 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;
 
 public class Util {
 
@@ -10,7 +11,7 @@ public class Util {
     }
 
     public static String getStringIfNotBlank(Optional<String> value) {
-        String string = value.orNull();
+        var string = value.orNull();
         if (string == null || string.isBlank()) {
             return null;
         }
@@ -18,10 +19,10 @@ public class Util {
     }
 
     public static String formatSafetyNumber(String digits) {
-        final int partCount = 12;
-        int partSize = digits.length() / partCount;
-        StringBuilder f = new StringBuilder(digits.length() + partCount);
-        for (int 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(" ");
         }
         return f.toString();
@@ -30,4 +31,8 @@ public class Util {
     public static GroupId decodeGroupId(String groupId) throws GroupIdFormatException {
         return GroupId.fromBase64(groupId);
     }
+
+    public static String getLegacyIdentifier(final SignalServiceAddress address) {
+        return address.getNumber().or(() -> address.getUuid().get().toString());
+    }
 }