Refactor ReceiveCommand in dbus mode and remove ExtendedDbusCommand

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

diff --git a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
index 7ba277d54d840105f83d4fe0f7464feb9074b3db..8bff73985ef4d9692e40acd2f3fb918534f49b88 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
@@ -1,14 +1,11 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 
-import org.asamk.Signal;
-import org.asamk.signal.manager.Manager;
-import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 
-import java.util.Base64;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -18,77 +15,65 @@ enum JsonSyncMessageType {
     REQUEST_SYNC
 }
 
-class JsonSyncMessage {
+record JsonSyncMessage(
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncDataMessage sentMessage,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<String> blockedNumbers,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<String> blockedGroupIds,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonSyncReadMessage> readMessages,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncMessageType type
+) {
 
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final JsonSyncDataMessage sentMessage;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final List<String> blockedNumbers;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final List<String> blockedGroupIds;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final List<JsonSyncReadMessage> readMessages;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final JsonSyncMessageType type;
+    JsonSyncMessage(
+            final JsonSyncDataMessage sentMessage,
+            final List<String> blockedNumbers,
+            final List<String> blockedGroupIds,
+            final List<JsonSyncReadMessage> readMessages,
+            final JsonSyncMessageType type
+    ) {
+        this.sentMessage = sentMessage;
+        this.blockedNumbers = blockedNumbers;
+        this.blockedGroupIds = blockedGroupIds;
+        this.readMessages = readMessages;
+        this.type = type;
+    }
 
-    JsonSyncMessage(SignalServiceSyncMessage syncMessage, Manager m) {
-        this.sentMessage = syncMessage.getSent().isPresent()
-                ? new JsonSyncDataMessage(syncMessage.getSent().get(), m)
+    static JsonSyncMessage from(MessageEnvelope.Sync syncMessage) {
+        final var sentMessage = syncMessage.sent().isPresent()
+                ? JsonSyncDataMessage.from(syncMessage.sent().get())
                 : null;
-        if (syncMessage.getBlockedList().isPresent()) {
-            final var base64 = Base64.getEncoder();
-            this.blockedNumbers = syncMessage.getBlockedList()
+        final List<String> blockedNumbers;
+        final List<String> blockedGroupIds;
+        if (syncMessage.blocked().isPresent()) {
+            blockedNumbers = syncMessage.blocked()
                     .get()
-                    .getAddresses()
+                    .recipients()
                     .stream()
-                    .map(SignalServiceAddress::getLegacyIdentifier)
+                    .map(RecipientAddress::getLegacyIdentifier)
                     .collect(Collectors.toList());
-            this.blockedGroupIds = syncMessage.getBlockedList()
+            blockedGroupIds = syncMessage.blocked()
                     .get()
-                    .getGroupIds()
+                    .groupIds()
                     .stream()
-                    .map(base64::encodeToString)
+                    .map(GroupId::toBase64)
                     .collect(Collectors.toList());
         } else {
-            this.blockedNumbers = null;
-            this.blockedGroupIds = null;
-        }
-        if (syncMessage.getRead().isPresent()) {
-            this.readMessages = syncMessage.getRead()
-                    .get()
-                    .stream()
-                    .map(message -> new JsonSyncReadMessage(message.getSender().getLegacyIdentifier(),
-                            message.getTimestamp()))
-                    .collect(Collectors.toList());
-        } else {
-            this.readMessages = null;
+            blockedNumbers = null;
+            blockedGroupIds = null;
         }
 
-        if (syncMessage.getContacts().isPresent()) {
-            this.type = JsonSyncMessageType.CONTACTS_SYNC;
-        } else if (syncMessage.getGroups().isPresent()) {
-            this.type = JsonSyncMessageType.GROUPS_SYNC;
-        } else if (syncMessage.getRequest().isPresent()) {
-            this.type = JsonSyncMessageType.REQUEST_SYNC;
+        final var readMessages = syncMessage.read().size() > 0 ? syncMessage.read()
+                .stream()
+                .map(JsonSyncReadMessage::from)
+                .collect(Collectors.toList()) : null;
+
+        final JsonSyncMessageType type;
+        if (syncMessage.contacts().isPresent()) {
+            type = JsonSyncMessageType.CONTACTS_SYNC;
+        } else if (syncMessage.groups().isPresent()) {
+            type = JsonSyncMessageType.GROUPS_SYNC;
         } else {
-            this.type = null;
+            type = null;
         }
-    }
-
-    JsonSyncMessage(Signal.SyncMessageReceived messageReceived) {
-        this.sentMessage = new JsonSyncDataMessage(messageReceived);
-        this.blockedNumbers = null;
-        this.blockedGroupIds = null;
-        this.readMessages = null;
-        this.type = null;
+        return new JsonSyncMessage(sentMessage, blockedNumbers, blockedGroupIds, readMessages, type);
     }
 }