Extend json output with number and uuid fields

[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 4944a74df04bb25ad2274b82bfd5454e09552fec..c7a3f8910e79bba5d6ee3d01791da69f06ade562 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -7,15 +7,28 @@ import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;

-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.util.InvalidNumberException;

 
 import java.util.List;
 
 import java.util.List;

+import java.util.UUID;
+
+import static org.asamk.signal.util.Util.getLegacyIdentifier;

 
 public class JsonMessageEnvelope {
 
     @JsonProperty
 
 public class JsonMessageEnvelope {
 
     @JsonProperty

+    @Deprecated

     final String source;
 
     final String source;
 

+    @JsonProperty
+    final String sourceNumber;
+
+    @JsonProperty
+    final String sourceUuid;
+
+    @JsonProperty
+    final String sourceName;
+

     @JsonProperty
     final Integer sourceDevice;
 
     @JsonProperty
     final Integer sourceDevice;
 


@@ -48,19 +61,33 @@ public class JsonMessageEnvelope {
 
     public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content, Manager m) {
         if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
 
     public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content, Manager m) {
         if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {

-            SignalServiceAddress source = envelope.getSourceAddress();
-            this.source = source.getLegacyIdentifier();
+            var source = envelope.getSourceAddress();
+            this.source = getLegacyIdentifier(source);
+            this.sourceNumber = source.getNumber().orNull();
+            this.sourceUuid = source.getUuid().transform(UUID::toString).orNull();

             this.sourceDevice = envelope.getSourceDevice();
             this.relay = source.getRelay().orNull();
         } else if (envelope.isUnidentifiedSender() && content != null) {
             this.sourceDevice = envelope.getSourceDevice();
             this.relay = source.getRelay().orNull();
         } else if (envelope.isUnidentifiedSender() && content != null) {

-            this.source = content.getSender().getLegacyIdentifier();
+            final var source = content.getSender();
+            this.source = getLegacyIdentifier(source);
+            this.sourceNumber = source.getNumber().orNull();
+            this.sourceUuid = source.getUuid().transform(UUID::toString).orNull();

             this.sourceDevice = content.getSenderDevice();
             this.relay = null;
         } else {
             this.source = null;
             this.sourceDevice = content.getSenderDevice();
             this.relay = null;
         } else {
             this.source = null;

+            this.sourceNumber = null;
+            this.sourceUuid = null;

             this.sourceDevice = null;
             this.relay = null;
         }
             this.sourceDevice = null;
             this.relay = null;
         }

+        String name;
+        try {
+            name = m.getContactOrProfileName(this.source);
+        } catch (InvalidNumberException | NullPointerException e) {
+            name = null;
+        }
+        this.sourceName = name;

         this.timestamp = envelope.getTimestamp();
         if (envelope.isReceipt()) {
             this.receiptMessage = JsonReceiptMessage.deliveryReceipt(timestamp, List.of(timestamp));
         this.timestamp = envelope.getTimestamp();
         if (envelope.isReceipt()) {
             this.receiptMessage = JsonReceiptMessage.deliveryReceipt(timestamp, List.of(timestamp));


@@ -86,6 +113,9 @@ public class JsonMessageEnvelope {
 
     public JsonMessageEnvelope(Signal.MessageReceived messageReceived) {
         source = messageReceived.getSender();
 
     public JsonMessageEnvelope(Signal.MessageReceived messageReceived) {
         source = messageReceived.getSender();

+        sourceNumber = null;
+        sourceUuid = null;
+        sourceName = null;

         sourceDevice = null;
         relay = null;
         timestamp = messageReceived.getTimestamp();
         sourceDevice = null;
         relay = null;
         timestamp = messageReceived.getTimestamp();


@@ -98,6 +128,9 @@ public class JsonMessageEnvelope {
 
     public JsonMessageEnvelope(Signal.ReceiptReceived receiptReceived) {
         source = receiptReceived.getSender();
 
     public JsonMessageEnvelope(Signal.ReceiptReceived receiptReceived) {
         source = receiptReceived.getSender();

+        sourceNumber = null;
+        sourceUuid = null;
+        sourceName = null;

         sourceDevice = null;
         relay = null;
         timestamp = receiptReceived.getTimestamp();
         sourceDevice = null;
         relay = null;
         timestamp = receiptReceived.getTimestamp();


@@ -110,6 +143,9 @@ public class JsonMessageEnvelope {
 
     public JsonMessageEnvelope(Signal.SyncMessageReceived messageReceived) {
         source = messageReceived.getSource();
 
     public JsonMessageEnvelope(Signal.SyncMessageReceived messageReceived) {
         source = messageReceived.getSource();

+        sourceNumber = null;
+        sourceUuid = null;
+        sourceName = null;

         sourceDevice = null;
         relay = null;
         timestamp = messageReceived.getTimestamp();
         sourceDevice = null;
         relay = null;
         timestamp = messageReceived.getTimestamp();