Use Java 17

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

diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index c7a3f8910e79bba5d6ee3d01791da69f06ade562..0d44de5d91fd3540ebc4135bafae138ffaf640ea 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -5,12 +5,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.UntrustedIdentityException;
+import org.asamk.signal.manager.api.RecipientIdentifier;

 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.util.List;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.util.List;

-import java.util.UUID;

 
 import static org.asamk.signal.util.Util.getLegacyIdentifier;
 
 
 import static org.asamk.signal.util.Util.getLegacyIdentifier;
 


@@ -32,10 +33,6 @@ public class JsonMessageEnvelope {
     @JsonProperty
     final Integer sourceDevice;
 
     @JsonProperty
     final Integer sourceDevice;
 

-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final String relay;
-

     @JsonProperty
     final long timestamp;
 
     @JsonProperty
     final long timestamp;
 


@@ -59,31 +56,36 @@ public class JsonMessageEnvelope {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     final JsonTypingMessage typingMessage;
 
     @JsonInclude(JsonInclude.Include.NON_NULL)
     final JsonTypingMessage typingMessage;
 

-    public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content, Manager m) {
-        if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
-            var source = envelope.getSourceAddress();
+    public JsonMessageEnvelope(
+            SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception, Manager m
+    ) {
+        if (!envelope.isUnidentifiedSender() && envelope.hasSourceUuid()) {
+            var source = m.resolveSignalServiceAddress(envelope.getSourceAddress());

             this.source = getLegacyIdentifier(source);
             this.sourceNumber = source.getNumber().orNull();
             this.source = getLegacyIdentifier(source);
             this.sourceNumber = source.getNumber().orNull();

-            this.sourceUuid = source.getUuid().transform(UUID::toString).orNull();
+            this.sourceUuid = source.getUuid().toString();

             this.sourceDevice = envelope.getSourceDevice();
             this.sourceDevice = envelope.getSourceDevice();

-            this.relay = source.getRelay().orNull();

         } else if (envelope.isUnidentifiedSender() && content != null) {
         } else if (envelope.isUnidentifiedSender() && content != null) {

-            final var source = content.getSender();
+            final var source = m.resolveSignalServiceAddress(content.getSender());

             this.source = getLegacyIdentifier(source);
             this.sourceNumber = source.getNumber().orNull();
             this.source = getLegacyIdentifier(source);
             this.sourceNumber = source.getNumber().orNull();

-            this.sourceUuid = source.getUuid().transform(UUID::toString).orNull();
+            this.sourceUuid = source.getUuid().toString();

             this.sourceDevice = content.getSenderDevice();
             this.sourceDevice = content.getSenderDevice();

-            this.relay = null;
+        } else if (exception instanceof UntrustedIdentityException e) {
+            final var source = m.resolveSignalServiceAddress(e.getSender());
+            this.source = getLegacyIdentifier(source);
+            this.sourceNumber = source.getNumber().orNull();
+            this.sourceUuid = source.getUuid().toString();
+            this.sourceDevice = e.getSenderDevice();

         } else {
             this.source = null;
             this.sourceNumber = null;
             this.sourceUuid = null;
             this.sourceDevice = null;
         } else {
             this.source = null;
             this.sourceNumber = null;
             this.sourceUuid = null;
             this.sourceDevice = null;

-            this.relay = null;

         }
         String name;
         try {
         }
         String name;
         try {

-            name = m.getContactOrProfileName(this.source);
+            name = m.getContactOrProfileName(RecipientIdentifier.Single.fromString(this.source, m.getSelfNumber()));

         } catch (InvalidNumberException | NullPointerException e) {
             name = null;
         }
         } catch (InvalidNumberException | NullPointerException e) {
             name = null;
         }


@@ -117,7 +119,6 @@ public class JsonMessageEnvelope {
         sourceUuid = null;
         sourceName = null;
         sourceDevice = null;
         sourceUuid = null;
         sourceName = null;
         sourceDevice = null;

-        relay = null;

         timestamp = messageReceived.getTimestamp();
         receiptMessage = null;
         dataMessage = new JsonDataMessage(messageReceived);
         timestamp = messageReceived.getTimestamp();
         receiptMessage = null;
         dataMessage = new JsonDataMessage(messageReceived);


@@ -132,7 +133,6 @@ public class JsonMessageEnvelope {
         sourceUuid = null;
         sourceName = null;
         sourceDevice = null;
         sourceUuid = null;
         sourceName = null;
         sourceDevice = null;

-        relay = null;

         timestamp = receiptReceived.getTimestamp();
         receiptMessage = JsonReceiptMessage.deliveryReceipt(timestamp, List.of(timestamp));
         dataMessage = null;
         timestamp = receiptReceived.getTimestamp();
         receiptMessage = JsonReceiptMessage.deliveryReceipt(timestamp, List.of(timestamp));
         dataMessage = null;


@@ -147,7 +147,6 @@ public class JsonMessageEnvelope {
         sourceUuid = null;
         sourceName = null;
         sourceDevice = null;
         sourceUuid = null;
         sourceName = null;
         sourceDevice = null;

-        relay = null;

         timestamp = messageReceived.getTimestamp();
         receiptMessage = null;
         dataMessage = null;
         timestamp = messageReceived.getTimestamp();
         receiptMessage = null;
         dataMessage = null;