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 2628844f1dcfd73cfe69a10b31154b9cc3eefdf0..8bff73985ef4d9692e40acd2f3fb918534f49b88 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
@@ -2,12 +2,10 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

-import org.asamk.Signal;
-import org.asamk.signal.manager.Manager;
-import org.asamk.signal.util.Util;
-import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
+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;
 
 import java.util.List;
 import java.util.stream.Collectors;
 


@@ -39,50 +37,43 @@ record JsonSyncMessage(
         this.type = type;
     }
 
         this.type = type;
     }
 

-    static JsonSyncMessage from(SignalServiceSyncMessage syncMessage, Manager m) {
-        final var sentMessage = syncMessage.getSent().isPresent() ? JsonSyncDataMessage.from(syncMessage.getSent()
-                .get(), m) : null;
+    static JsonSyncMessage from(MessageEnvelope.Sync syncMessage) {
+        final var sentMessage = syncMessage.sent().isPresent()
+                ? JsonSyncDataMessage.from(syncMessage.sent().get())
+                : null;

         final List<String> blockedNumbers;
         final List<String> blockedGroupIds;
         final List<String> blockedNumbers;
         final List<String> blockedGroupIds;

-        if (syncMessage.getBlockedList().isPresent()) {
-            final var base64 = Base64.getEncoder();
-            blockedNumbers = syncMessage.getBlockedList()
+        if (syncMessage.blocked().isPresent()) {
+            blockedNumbers = syncMessage.blocked()

                     .get()
                     .get()

-                    .getAddresses()
+                    .recipients()

                     .stream()
                     .stream()

-                    .map(Util::getLegacyIdentifier)
+                    .map(RecipientAddress::getLegacyIdentifier)

                     .collect(Collectors.toList());
                     .collect(Collectors.toList());

-            blockedGroupIds = syncMessage.getBlockedList()
+            blockedGroupIds = syncMessage.blocked()

                     .get()
                     .get()

-                    .getGroupIds()
+                    .groupIds()

                     .stream()
                     .stream()

-                    .map(base64::encodeToString)
+                    .map(GroupId::toBase64)

                     .collect(Collectors.toList());
         } else {
             blockedNumbers = null;
             blockedGroupIds = null;
         }
 
                     .collect(Collectors.toList());
         } else {
             blockedNumbers = null;
             blockedGroupIds = null;
         }
 

-        final var readMessages = syncMessage.getRead().isPresent() ? syncMessage.getRead()
-                .get()
+        final var readMessages = syncMessage.read().size() > 0 ? syncMessage.read()

                 .stream()
                 .map(JsonSyncReadMessage::from)
                 .collect(Collectors.toList()) : null;
 
         final JsonSyncMessageType type;
                 .stream()
                 .map(JsonSyncReadMessage::from)
                 .collect(Collectors.toList()) : null;
 
         final JsonSyncMessageType type;

-        if (syncMessage.getContacts().isPresent()) {
+        if (syncMessage.contacts().isPresent()) {

             type = JsonSyncMessageType.CONTACTS_SYNC;
             type = JsonSyncMessageType.CONTACTS_SYNC;

-        } else if (syncMessage.getGroups().isPresent()) {
+        } else if (syncMessage.groups().isPresent()) {

             type = JsonSyncMessageType.GROUPS_SYNC;
             type = JsonSyncMessageType.GROUPS_SYNC;

-        } else if (syncMessage.getRequest().isPresent()) {
-            type = JsonSyncMessageType.REQUEST_SYNC;

         } else {
             type = null;
         }
         return new JsonSyncMessage(sentMessage, blockedNumbers, blockedGroupIds, readMessages, type);
     }
         } else {
             type = null;
         }
         return new JsonSyncMessage(sentMessage, blockedNumbers, blockedGroupIds, readMessages, type);
     }

-
-    static JsonSyncMessage from(Signal.SyncMessageReceived messageReceived) {
-        return new JsonSyncMessage(JsonSyncDataMessage.from(messageReceived), null, null, null, null);
-    }

 }
 }