Use java.util.Optional in Manager interface

[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 0afe09105457b7dcafe01bb99340546c6b506aa1..5ded399eaf887a765a7edd30fb458ae9af8af5d8 100644 (file)
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -5,9 +5,6 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
 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;
@@ -20,7 +17,7 @@ public class Util {
     private Util() {
     }
 
-    public static String getStringIfNotBlank(Optional<String> value) {
+    public static String getStringIfNotBlank(org.whispersystems.libsignal.util.guava.Optional<String> value) {
         var string = value.orNull();
         if (string == null || string.isBlank()) {
             return null;
@@ -61,12 +58,8 @@ public class Util {
         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());
+        return address.getNumber().or(() -> address.getUuid().toString());
     }
 
     public static ObjectMapper createJsonObjectMapper() {