X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/5cd5697aea9c2a032abc9ffc3a935e356ce65583..62687d103fab1ade650b920008060c220361d581:/src/main/java/org/asamk/signal/json/JsonDataMessage.java

diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index c645b512..46328466 100644
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -2,11 +2,9 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import org.asamk.Signal;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 record JsonDataMessage(
         long timestamp,
@@ -37,20 +35,20 @@ record JsonDataMessage(
         final var mentions = dataMessage.mentions().size() > 0 ? dataMessage.mentions()
                 .stream()
                 .map(JsonMention::from)
-                .collect(Collectors.toList()) : null;
+                .toList() : null;
         final var remoteDelete = dataMessage.remoteDeleteId().isPresent()
                 ? new JsonRemoteDelete(dataMessage.remoteDeleteId().get())
                 : null;
         final var attachments = dataMessage.attachments().size() > 0 ? dataMessage.attachments()
                 .stream()
                 .map(JsonAttachment::from)
-                .collect(Collectors.toList()) : null;
+                .toList() : null;
         final var sticker = dataMessage.sticker().isPresent() ? JsonSticker.from(dataMessage.sticker().get()) : null;
 
         final var contacts = dataMessage.sharedContacts().size() > 0 ? dataMessage.sharedContacts()
                 .stream()
                 .map(JsonSharedContact::from)
-                .collect(Collectors.toList()) : null;
+                .toList() : null;
         return new JsonDataMessage(timestamp,
                 message,
                 expiresInSeconds,
@@ -65,38 +63,4 @@ record JsonDataMessage(
                 contacts,
                 groupInfo);
     }
-
-    static JsonDataMessage from(Signal.MessageReceived messageReceived) {
-        return new JsonDataMessage(messageReceived.getTimestamp(),
-                messageReceived.getMessage(),
-                // TODO Replace these with the proper commands
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                messageReceived.getAttachments().stream().map(JsonAttachment::from).collect(Collectors.toList()),
-                null,
-                null,
-                null,
-                messageReceived.getGroupId().length > 0 ? JsonGroupInfo.from(messageReceived.getGroupId()) : null);
-    }
-
-    static JsonDataMessage from(Signal.SyncMessageReceived messageReceived) {
-        return new JsonDataMessage(messageReceived.getTimestamp(),
-                messageReceived.getMessage(),
-                // TODO Replace these with the proper commands
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                messageReceived.getAttachments().stream().map(JsonAttachment::from).collect(Collectors.toList()),
-                null,
-                null,
-                null,
-                messageReceived.getGroupId().length > 0 ? JsonGroupInfo.from(messageReceived.getGroupId()) : null);
-    }
 }