Remove libsignal-service from manager lib API

[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..c844e2ea910787f5cccdf1e7c18ff1d464cd7153 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -5,14 +5,10 @@ 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 java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;

+import java.util.Optional;

 import java.util.stream.Collectors;
 
 public class Util {
 import java.util.stream.Collectors;
 
 public class Util {


@@ -21,7 +17,7 @@ public class Util {
     }
 
     public static String getStringIfNotBlank(Optional<String> value) {
     }
 
     public static String getStringIfNotBlank(Optional<String> value) {

-        var string = value.orNull();
+        var string = value.orElse(null);

         if (string == null || string.isBlank()) {
             return null;
         }
         if (string == null || string.isBlank()) {
             return null;
         }


@@ -45,23 +41,22 @@ 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) {
-        return address.getNumber().or(() -> address.getUuid().get().toString());
-    }
-

     public static ObjectMapper createJsonObjectMapper() {
         var objectMapper = new ObjectMapper();
         objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.PUBLIC_ONLY);
     public static ObjectMapper createJsonObjectMapper() {
         var objectMapper = new ObjectMapper();
         objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.PUBLIC_ONLY);