Add MultiAccountManager

[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..ec61b2f166da26485f9487aa6b4bd3117733a4cd 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
@@ -1,20 +1,17 @@
 package org.asamk.signal.json;
 
-import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
+import org.asamk.signal.manager.api.MessageEnvelope;
 
 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();
-        final var timestamps = receiptMessage.getTimestamps();
-        return new JsonReceiptMessage(when, isDelivery, isRead, timestamps);
-    }
-
-    static JsonReceiptMessage deliveryReceipt(final long when, final List<Long> timestamps) {
-        return new JsonReceiptMessage(when, true, false, timestamps);
+    static JsonReceiptMessage from(MessageEnvelope.Receipt receiptMessage) {
+        final var when = receiptMessage.when();
+        final var isDelivery = receiptMessage.type() == MessageEnvelope.Receipt.Type.DELIVERY;
+        final var isRead = receiptMessage.type() == MessageEnvelope.Receipt.Type.READ;
+        final var isViewed = receiptMessage.type() == MessageEnvelope.Receipt.Type.VIEWED;
+        final var timestamps = receiptMessage.timestamps();
+        return new JsonReceiptMessage(when, isDelivery, isRead, isViewed, timestamps);
     }
 }