X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/8bcd8d87d219ae0496986cba4bd6b89f3b2ad6f6..e03c48e0ae58c3d37e03dc3eb0e89d44b07d40f9:/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 b4954bf3..c844e2ea 100644
--- 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().toString());
-    }
-
     public static ObjectMapper createJsonObjectMapper() {
         var objectMapper = new ObjectMapper();
         objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.PUBLIC_ONLY);