]> nmode's Git Repositories - signal-cli/blobdiff - src/main/java/org/asamk/signal/json/JsonSyncMessage.java
Update libsignal-service-java
[signal-cli] / src / main / java / org / asamk / signal / json / JsonSyncMessage.java
index 554b0724a28ce7427f2c7b63219815343f1eacb8..6f512016ee0b0126446c679abc2edb6bad4a5cb8 100644 (file)
@@ -2,13 +2,11 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import org.asamk.Signal;
 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.List;
-import java.util.stream.Collectors;
 
 enum JsonSyncMessageType {
     CONTACTS_SYNC,
@@ -50,13 +48,8 @@ record JsonSyncMessage(
                     .recipients()
                     .stream()
                     .map(RecipientAddress::getLegacyIdentifier)
-                    .collect(Collectors.toList());
-            blockedGroupIds = syncMessage.blocked()
-                    .get()
-                    .groupIds()
-                    .stream()
-                    .map(GroupId::toBase64)
-                    .collect(Collectors.toList());
+                    .toList();
+            blockedGroupIds = syncMessage.blocked().get().groupIds().stream().map(GroupId::toBase64).toList();
         } else {
             blockedNumbers = null;
             blockedGroupIds = null;
@@ -65,7 +58,7 @@ record JsonSyncMessage(
         final var readMessages = syncMessage.read().size() > 0 ? syncMessage.read()
                 .stream()
                 .map(JsonSyncReadMessage::from)
-                .collect(Collectors.toList()) : null;
+                .toList() : null;
 
         final JsonSyncMessageType type;
         if (syncMessage.contacts().isPresent()) {
@@ -77,8 +70,4 @@ record JsonSyncMessage(
         }
         return new JsonSyncMessage(sentMessage, blockedNumbers, blockedGroupIds, readMessages, type);
     }
-
-    static JsonSyncMessage from(Signal.SyncMessageReceived messageReceived) {
-        return new JsonSyncMessage(JsonSyncDataMessage.from(messageReceived), null, null, null, null);
-    }
 }