Improve dbus error handling

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

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index e1a9a2f311bdbd594a42b1cbf0c6b5166636c7c9..fe062ffc58b116bae801d6976f8b482e6537dd40 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -61,19 +61,19 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
             if (outputWriter instanceof JsonWriter jsonWriter) {
 
                 dbusconnection.addSigHandler(Signal.MessageReceived.class, signal, messageReceived -> {
-                    var envelope = new JsonMessageEnvelope(messageReceived);
+                    var envelope = JsonMessageEnvelope.from(messageReceived);
                     final var object = Map.of("envelope", envelope);
                     jsonWriter.write(object);
                 });
 
                 dbusconnection.addSigHandler(Signal.ReceiptReceived.class, signal, receiptReceived -> {
-                    var envelope = new JsonMessageEnvelope(receiptReceived);
+                    var envelope = JsonMessageEnvelope.from(receiptReceived);
                     final var object = Map.of("envelope", envelope);
                     jsonWriter.write(object);
                 });
 
                 dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, signal, syncReceived -> {
-                    var envelope = new JsonMessageEnvelope(syncReceived);
+                    var envelope = JsonMessageEnvelope.from(syncReceived);
                     final var object = Map.of("envelope", envelope);
                     jsonWriter.write(object);
                 });