]> nmode's Git Repositories - signal-cli/blobdiff - src/main/java/org/asamk/signal/json/JsonMention.java
Update libsignal-service-java
[signal-cli] / src / main / java / org / asamk / signal / json / JsonMention.java
index f0c66d00867c3df9b3cb945aab446dabe5127364..b24768b7c38bb1a74dcfc53e6b7d525ffd4124a5 100644 (file)
@@ -4,9 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-
-import java.util.UUID;
 
 import static org.asamk.signal.util.Util.getLegacyIdentifier;
 
@@ -29,10 +26,10 @@ public class JsonMention {
     final int length;
 
     JsonMention(SignalServiceDataMessage.Mention mention, Manager m) {
-        final var address = m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid(), null));
+        final var address = m.resolveSignalServiceAddress(mention.getUuid());
         this.name = getLegacyIdentifier(address);
         this.number = address.getNumber().orNull();
-        this.uuid = address.getUuid().transform(UUID::toString).orNull();
+        this.uuid = address.getUuid().toString();
         this.start = mention.getStart();
         this.length = mention.getLength();
     }