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

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

 
 

-    long when;
-    boolean isDelivery;
-    boolean isRead;
-    List<Long> timestamps;
-
-    JsonReceiptMessage(SignalServiceReceiptMessage receiptMessage) {
+    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();
+        return new JsonReceiptMessage(when, isDelivery, isRead, isViewed, timestamps);
+    }

 
 

-        this.when = receiptMessage.getWhen();
-        if (receiptMessage.isDeliveryReceipt()) {
-            this.isDelivery = true;
-        }
-        if (receiptMessage.isReadReceipt()) {
-            this.isRead = true;
-        }
-        this.timestamps = receiptMessage.getTimestamps();
+    static JsonReceiptMessage deliveryReceipt(final long when, final List<Long> timestamps) {
+        return new JsonReceiptMessage(when, true, false, false, false, timestamps);

     }
 }
     }
 }