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 01a79dd10b52fc7811b6b9819715d33850c5ef59..c844e2ea910787f5cccdf1e7c18ff1d464cd7153 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -5,12 +5,10 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-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.Optional;
 import java.util.stream.Collectors;
 
 public class Util {
@@ -19,7 +17,7 @@ public class Util {
     }
 
     public static String getStringIfNotBlank(Optional<String> value) {
-        var string = value.orNull();
+        var string = value.orElse(null);
         if (string == null || string.isBlank()) {
             return null;
         }
@@ -59,10 +57,6 @@ public class Util {
         return f.toString();
     }
 
-    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);