Fix showing sender of synced messages

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

diff --git a/src/main/java/org/asamk/signal/JsonSyncMessage.java b/src/main/java/org/asamk/signal/JsonSyncMessage.java
index febf64a444719931a97498ebb13a185329da5c6b..a6ecb459fd7887c482d88423f6c65300af36916b 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/JsonSyncMessage.java
@@ -2,24 +2,45 @@ package org.asamk.signal;
 
 import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
+
+import java.util.ArrayList;
 import java.util.List;
 
+enum JsonSyncMessageType {
+  CONTACTS_SYNC,
+  GROUPS_SYNC,
+  REQUEST_SYNC
+}
+
 class JsonSyncMessage {
 
-    JsonDataMessage sentMessage;
+    JsonSyncDataMessage sentMessage;
     List<String> blockedNumbers;
     List<ReadMessage> readMessages;
+    JsonSyncMessageType type;
 
     JsonSyncMessage(SignalServiceSyncMessage syncMessage) {
-        if (syncMessage.getSent().isPresent()) {
-            this.sentMessage = new JsonDataMessage(syncMessage.getSent().get().getMessage());
-        }
-        if (syncMessage.getBlockedList().isPresent()) {
-            this.blockedNumbers = syncMessage.getBlockedList().get().getNumbers();
-        }
-        if (syncMessage.getRead().isPresent()) {
-            this.readMessages = syncMessage.getRead().get();
-        }
-    }
+       if (syncMessage.getSent().isPresent()) {
+           this.sentMessage = new JsonSyncDataMessage(syncMessage.getSent().get());
+       }
+       if (syncMessage.getBlockedList().isPresent()) {
+           this.blockedNumbers = new ArrayList<>(syncMessage.getBlockedList().get().getAddresses().size());
+           for (SignalServiceAddress address : syncMessage.getBlockedList().get().getAddresses()) {
+               this.blockedNumbers.add(address.getNumber().get());
+           }
+       }
+       if (syncMessage.getRead().isPresent()) {
+           this.readMessages = syncMessage.getRead().get();
+       }
+
+       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;
+       }
+   }
 }