Update libsignal-service-java

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / util / Utils.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index a2466311680f3580c70394c8ef5b6eea9032b38a..3530d6ad7818d1cd51454f056541d55ba8eaa98a 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -48,11 +48,11 @@ public class Utils {
         byte[] ownId;
         byte[] theirId;
 
-        if (isUuidCapable && ownAddress.getUuid().isPresent() && theirAddress.getUuid().isPresent()) {
+        if (isUuidCapable) {
             // Version 2: UUID user
             version = 2;
-            ownId = UuidUtil.toByteArray(ownAddress.getUuid().get());
-            theirId = UuidUtil.toByteArray(theirAddress.getUuid().get());
+            ownId = UuidUtil.toByteArray(ownAddress.getUuid());
+            theirId = UuidUtil.toByteArray(theirAddress.getUuid());
         } else {
             // Version 1: E164 user
             version = 1;
@@ -69,12 +69,4 @@ public class Utils {
                 theirId,
                 theirIdentityKey);
     }
-
-    public static SignalServiceAddress getSignalServiceAddressFromIdentifier(final String identifier) {
-        if (UuidUtil.isUuid(identifier)) {
-            return new SignalServiceAddress(UuidUtil.parseOrNull(identifier), null);
-        } else {
-            return new SignalServiceAddress(null, identifier);
-        }
-    }
 }