X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/9e6a3534275d5bac8454792e05280f13fa5ef13c..30690785fd51f9ba841f6f57d5f403bd970f26e3:/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 79a6587b..a9d2bb8f 100644
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -1,66 +1,38 @@
 package org.asamk.signal.util;
 
-import com.fasterxml.jackson.databind.JsonNode;
-
 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.signalservice.api.util.InvalidNumberException;
-import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
-import org.whispersystems.signalservice.api.util.UuidUtil;
-
-import java.io.InvalidObjectException;
 
 public class Util {
 
     private 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++) {
-            f.append(digits, i * partSize, (i * partSize) + partSize).append(" ");
-        }
-        return f.toString();
-    }
-
-    public static String join(CharSequence separator, Iterable<? extends CharSequence> list) {
-        StringBuilder buf = new StringBuilder();
-        for (CharSequence str : list) {
-            if (buf.length() > 0) {
-                buf.append(separator);
-            }
-            buf.append(str);
+    public static String getStringIfNotBlank(Optional<String> value) {
+        var string = value.orNull();
+        if (string == null || string.isBlank()) {
+            return null;
         }
-
-        return buf.toString();
+        return string;
     }
 
-    public static JsonNode getNotNullNode(JsonNode parent, String name) throws InvalidObjectException {
-        JsonNode node = parent.get(name);
-        if (node == null) {
-            throw new InvalidObjectException(String.format("Incorrect file format: expected parameter %s not found ",
-                    name));
+    public static String formatSafetyNumber(String digits) {
+        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 node;
+        return f.toString();
     }
 
     public static GroupId decodeGroupId(String groupId) throws GroupIdFormatException {
         return GroupId.fromBase64(groupId);
     }
 
-    public static String canonicalizeNumber(String number, String localNumber) throws InvalidNumberException {
-        return PhoneNumberFormatter.formatNumber(number, localNumber);
-    }
-
-    public static SignalServiceAddress getSignalServiceAddressFromIdentifier(final String identifier) {
-        if (UuidUtil.isUuid(identifier)) {
-            return new SignalServiceAddress(UuidUtil.parseOrNull(identifier), null);
-        } else {
-            return new SignalServiceAddress(null, identifier);
-        }
+    public static String getLegacyIdentifier(final SignalServiceAddress address) {
+        return address.getNumber().or(() -> address.getUuid().get().toString());
     }
 }