update deliveryReceipt to conform

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

diff --git a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
index b2ab7f75597eb5e5f5d08476f6e83d71f0d3b78b..15e2cf434f6a41f0b44d9c2d7eaf0facc81b5808 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
@@ -1,36 +1,47 @@
 package org.asamk.signal.json;
 
 package org.asamk.signal.json;
 

+import com.fasterxml.jackson.annotation.JsonProperty;
+

 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 
 import java.util.List;
 
 class JsonReceiptMessage {
 
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 
 import java.util.List;
 
 class JsonReceiptMessage {
 

-    long when;
-    boolean isDelivery;
-    boolean isRead;
-    List<Long> timestamps;
+    @JsonProperty
+    final long when;

 
 

-    JsonReceiptMessage(SignalServiceReceiptMessage receiptMessage) {
+    @JsonProperty
+    final boolean isDelivery;
+
+    @JsonProperty
+    final boolean isRead;

 
 

+    @JsonProperty
+    final boolean isViewed;
+
+    @JsonProperty
+    final List<Long> timestamps;
+
+    JsonReceiptMessage(SignalServiceReceiptMessage receiptMessage) {

         this.when = receiptMessage.getWhen();
         this.when = receiptMessage.getWhen();

-        if (receiptMessage.isDeliveryReceipt()) {
-            this.isDelivery = true;
-        }
-        if (receiptMessage.isReadReceipt()) {
-            this.isRead = true;
-        }
+        this.isDelivery = receiptMessage.isDeliveryReceipt();
+        this.isRead = receiptMessage.isReadReceipt();
+        this.isViewed = receiptMessage.isViewedReceipt();

         this.timestamps = receiptMessage.getTimestamps();
     }
 
         this.timestamps = receiptMessage.getTimestamps();
     }
 

-    private JsonReceiptMessage(final long when, final boolean isDelivery, final boolean isRead, final List<Long> timestamps) {
+    private JsonReceiptMessage(
+            final long when, final boolean isDelivery, final boolean isRead, final boolean isViewed, final List<Long> timestamps
+    ) {

         this.when = when;
         this.isDelivery = isDelivery;
         this.isRead = isRead;
         this.when = when;
         this.isDelivery = isDelivery;
         this.isRead = isRead;

+        this.isViewed = isViewed;

         this.timestamps = timestamps;
     }
 
     static JsonReceiptMessage deliveryReceipt(final long when, final List<Long> timestamps) {
         this.timestamps = timestamps;
     }
 
     static JsonReceiptMessage deliveryReceipt(final long when, final List<Long> timestamps) {

-        return new JsonReceiptMessage(when, true, false, timestamps);
+        return new JsonReceiptMessage(when, true, false, false, timestamps);

     }
 }
     }
 }