From: Gabriel Fernández Valdés <gabriel@raciantau.com>
Date: Mon, 23 Sep 2019 16:31:55 +0000 (-0400)
Subject: Added ReceiptMessage to JSON output
X-Git-Tag: v0.6.4~10
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/7e267f1ebb17dd8e6b9ea007c2d65305fea0fb05

Added ReceiptMessage to JSON output
---

diff --git a/src/main/java/org/asamk/signal/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
index 9971b011..e7003130 100644
--- a/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/JsonMessageEnvelope.java
@@ -14,6 +14,7 @@ class JsonMessageEnvelope {
     JsonDataMessage dataMessage;
     JsonSyncMessage syncMessage;
     JsonCallMessage callMessage;
+    JsonReceiptMessage receiptMessage;
 
     public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content) {
         SignalServiceAddress source = envelope.getSourceAddress();
@@ -32,6 +33,9 @@ class JsonMessageEnvelope {
             if (content.getCallMessage().isPresent()) {
                 this.callMessage = new JsonCallMessage(content.getCallMessage().get());
             }
+            if (content.getReceiptMessage().isPresent()) {
+                this.receiptMessage = new JsonReceiptMessage(content.getReceiptMessage().get());
+            }
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/JsonReceiptMessage.java b/src/main/java/org/asamk/signal/JsonReceiptMessage.java
new file mode 100644
index 00000000..fd875af5
--- /dev/null
+++ b/src/main/java/org/asamk/signal/JsonReceiptMessage.java
@@ -0,0 +1,25 @@
+package org.asamk.signal;
+
+import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
+
+import java.util.List;
+
+class JsonReceiptMessage {
+
+    long when;
+    boolean isDelivery;
+    boolean isRead;
+    List<Long> timestamps;
+
+    JsonReceiptMessage(SignalServiceReceiptMessage receiptMessage) {
+
+        this.when = receiptMessage.getWhen();
+        if (receiptMessage.isDeliveryReceipt()) {
+            this.isDelivery = true;
+        }
+        if (receiptMessage.isReadReceipt()) {
+            this.isRead = true;
+        }
+        this.timestamps = receiptMessage.getTimestamps();
+    }
+}