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 54869d25d49a0e3645219d1f06daeed5a69a5f50..1199c790270054aa08293ded2c116e825820f942 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
@@ -1,47 +1,21 @@
 package org.asamk.signal.json;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 
 import java.util.List;
 
-class JsonReceiptMessage {
-
-    @JsonProperty
-    final long when;
-
-    @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.isDelivery = receiptMessage.isDeliveryReceipt();
-        this.isRead = receiptMessage.isReadReceipt();
-        this.isViewed = receiptMessage.isViewedReceipt();
-        this.timestamps = receiptMessage.getTimestamps();
-    }
+record JsonReceiptMessage(long when, boolean isDelivery, boolean isRead, boolean isViewed, List<Long> timestamps) {
 
-    private JsonReceiptMessage(
-            final long when, final boolean isDelivery, final boolean isRead, final List<Long> timestamps
-    ) {
-        this.when = when;
-        this.isDelivery = isDelivery;
-        this.isRead = isRead;
-        this.isViewed = isViewed;
-        this.timestamps = timestamps;
+    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);
     }
 
     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);
     }
 }