Fix check if there was a send error when creating a group without members

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

diff --git a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
index c7cb2ab7f42a5d2c87ba130d4b5774f61402074b..375fb0b16ea4f52b9174e83cfa72a4dc47928a99 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
@@ -14,16 +14,13 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 
-    private final Manager m;
     private final DBusConnection conn;
     private final String objectPath;
 
-    public DbusReceiveMessageHandler(Manager m, DBusConnection conn, final String objectPath) {
-        this.m = m;
+    public DbusReceiveMessageHandler(DBusConnection conn, final String objectPath) {
         this.conn = conn;
         this.objectPath = objectPath;
     }
@@ -127,12 +124,12 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
             var attachments = message.attachments()
                     .stream()
                     .filter(a -> a.id().isPresent())
-                    .map(a -> getAttachmentMap(m, a))
-                    .collect(Collectors.toList());
+                    .map(this::getAttachmentMap)
+                    .toList();
             extras.put("attachments", new Variant<>(attachments, "aa{sv}"));
         }
         if (message.mentions().size() > 0) {
-            var mentions = message.mentions().stream().map(this::getMentionMap).collect(Collectors.toList());
+            var mentions = message.mentions().stream().map(this::getMentionMap).toList();
             extras.put("mentions", new Variant<>(mentions, "aa{sv}"));
         }
         extras.put("expiresInSeconds", new Variant<>(message.expiresInSeconds()));
@@ -165,7 +162,10 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
     }
 
     private Map<String, Variant<? extends Serializable>> getStickerMap(final MessageEnvelope.Data.Sticker sticker) {
-        return Map.of("packId", new Variant<>(sticker.packId()), "stickerId", new Variant<>(sticker.stickerId()));
+        return Map.of("packId",
+                new Variant<>(sticker.packId().serialize()),
+                "stickerId",
+                new Variant<>(sticker.stickerId()));
     }
 
     private Map<String, Variant<?>> getReactionMap(final MessageEnvelope.Data.Reaction reaction) {
@@ -180,7 +180,7 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
     }
 
     private Map<String, Variant<?>> getAttachmentMap(
-            final Manager m, final MessageEnvelope.Data.Attachment a
+            final MessageEnvelope.Data.Attachment a
     ) {
         final var map = new HashMap<String, Variant<?>>();
         if (a.id().isPresent()) {