Merge branch 'master' into dbus_sendviewed

[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 af7050b1c7c729fdce7753ea83149b111d2245d3..1199c790270054aa08293ded2c116e825820f942 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
@@ -4,17 +4,18 @@ import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage
 
 import java.util.List;
 
 
 import java.util.List;
 

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

 
     static JsonReceiptMessage from(SignalServiceReceiptMessage receiptMessage) {
         final var when = receiptMessage.getWhen();
         final var isDelivery = receiptMessage.isDeliveryReceipt();
         final var isRead = receiptMessage.isReadReceipt();
 
     static JsonReceiptMessage from(SignalServiceReceiptMessage receiptMessage) {
         final var when = receiptMessage.getWhen();
         final var isDelivery = receiptMessage.isDeliveryReceipt();
         final var isRead = receiptMessage.isReadReceipt();

+        final var isViewed = receiptMessage.isViewedReceipt();

         final var timestamps = receiptMessage.getTimestamps();
         final var timestamps = receiptMessage.getTimestamps();

-        return new JsonReceiptMessage(when, isDelivery, isRead, timestamps);
+        return new JsonReceiptMessage(when, isDelivery, isRead, isViewed, timestamps);

     }
 
     static JsonReceiptMessage deliveryReceipt(final long when, final List<Long> 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, false, timestamps);

     }
 }
     }
 }