Allow message from pending member if it's just a group update

[signal-cli] / src / main / java / org / asamk / signal / json / JsonMention.java

diff --git a/src/main/java/org/asamk/signal/json/JsonMention.java b/src/main/java/org/asamk/signal/json/JsonMention.java
index f0c66d00867c3df9b3cb945aab446dabe5127364..3c6f2eec091333721bd85ee12dd08dcafc547d35 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonMention.java
+++ b/src/main/java/org/asamk/signal/json/JsonMention.java
@@ -6,8 +6,6 @@ import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 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;
 
 public class JsonMention {
 import static org.asamk.signal.util.Util.getLegacyIdentifier;
 
 public class JsonMention {


@@ -29,10 +27,10 @@ public class JsonMention {
     final int length;
 
     JsonMention(SignalServiceDataMessage.Mention mention, Manager m) {
     final int length;
 
     JsonMention(SignalServiceDataMessage.Mention mention, Manager m) {

-        final var address = m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid(), null));
+        final var address = m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid()));

         this.name = getLegacyIdentifier(address);
         this.number = address.getNumber().orNull();
         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();
     }
         this.start = mention.getStart();
         this.length = mention.getLength();
     }