fix

[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 f29bc02eeea43b4c2b852c49167a4797c32cb7fd..6e992bcb0be0232c4fc0978e90bb7fadd10c6a17 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
@@ -1,13 +1,18 @@
 package org.asamk.signal.json;
 
 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.asamk.Signal;
 import org.asamk.signal.manager.Manager;

-import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage;
+import org.asamk.signal.util.Util;

 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;

-import org.whispersystems.signalservice.api.push.SignalServiceAddress;

 
 

-import java.util.ArrayList;
+import java.util.Base64;

 import java.util.List;
 import java.util.List;

+import java.util.stream.Collectors;
+
+import static org.asamk.signal.util.Util.getLegacyIdentifier;

 
 enum JsonSyncMessageType {
     CONTACTS_SYNC,
 
 enum JsonSyncMessageType {
     CONTACTS_SYNC,


@@ -17,23 +22,57 @@ enum JsonSyncMessageType {
 
 class JsonSyncMessage {
 
 
 class JsonSyncMessage {
 

-    JsonSyncDataMessage sentMessage;
-    List<String> blockedNumbers;
-    List<ReadMessage> readMessages;
-    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(SignalServiceSyncMessage syncMessage, Manager m) {
 
     JsonSyncMessage(SignalServiceSyncMessage syncMessage, Manager m) {

-        if (syncMessage.getSent().isPresent()) {
-            this.sentMessage = new JsonSyncDataMessage(syncMessage.getSent().get(), m);
-        }
+        this.sentMessage = syncMessage.getSent().isPresent()
+                ? new JsonSyncDataMessage(syncMessage.getSent().get(), m)
+                : null;

         if (syncMessage.getBlockedList().isPresent()) {
         if (syncMessage.getBlockedList().isPresent()) {

-            this.blockedNumbers = new ArrayList<>(syncMessage.getBlockedList().get().getAddresses().size());
-            for (SignalServiceAddress address : syncMessage.getBlockedList().get().getAddresses()) {
-                this.blockedNumbers.add(address.getLegacyIdentifier());
-            }
+            final var base64 = Base64.getEncoder();
+            this.blockedNumbers = syncMessage.getBlockedList()
+                    .get()
+                    .getAddresses()
+                    .stream()
+                    .map(Util::getLegacyIdentifier)
+                    .collect(Collectors.toList());
+            this.blockedGroupIds = syncMessage.getBlockedList()
+                    .get()
+                    .getGroupIds()
+                    .stream()
+                    .map(base64::encodeToString)
+                    .collect(Collectors.toList());
+        } else {
+            this.blockedNumbers = null;
+            this.blockedGroupIds = null;

         }
         if (syncMessage.getRead().isPresent()) {
         }
         if (syncMessage.getRead().isPresent()) {

-            this.readMessages = syncMessage.getRead().get();
+            this.readMessages = syncMessage.getRead()
+                    .get()
+                    .stream()
+                    .map(message -> new JsonSyncReadMessage(getLegacyIdentifier(message.getSender()),
+                            message.getTimestamp()))
+                    .collect(Collectors.toList());
+        } else {
+            this.readMessages = null;

         }
 
         if (syncMessage.getContacts().isPresent()) {
         }
 
         if (syncMessage.getContacts().isPresent()) {


@@ -42,10 +81,16 @@ class JsonSyncMessage {
             this.type = JsonSyncMessageType.GROUPS_SYNC;
         } else if (syncMessage.getRequest().isPresent()) {
             this.type = JsonSyncMessageType.REQUEST_SYNC;
             this.type = JsonSyncMessageType.GROUPS_SYNC;
         } else if (syncMessage.getRequest().isPresent()) {
             this.type = JsonSyncMessageType.REQUEST_SYNC;

+        } else {
+            this.type = null;

         }
     }
 
     JsonSyncMessage(Signal.SyncMessageReceived messageReceived) {
         }
     }
 
     JsonSyncMessage(Signal.SyncMessageReceived messageReceived) {

-        sentMessage = new JsonSyncDataMessage(messageReceived);
+        this.sentMessage = new JsonSyncDataMessage(messageReceived);
+        this.blockedNumbers = null;
+        this.blockedGroupIds = null;
+        this.readMessages = null;
+        this.type = null;

     }
 }
     }
 }