X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/221d937eecca5c9b09a3bee7df812203b9927a56..7f64a9812ca5bb10e8f57cacf3d22b904bd200b4:/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java

diff --git a/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java b/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java
index c8e1c24f..73c88947 100644
--- a/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java
@@ -17,9 +17,9 @@ public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler
     protected final Manager m;
     private final JsonWriter jsonWriter;
 
-    public JsonReceiveMessageHandler(Manager m) {
+    public JsonReceiveMessageHandler(Manager m, JsonWriter jsonWriter) {
         this.m = m;
-        jsonWriter = new JsonWriter(System.out);
+        this.jsonWriter = jsonWriter;
     }
 
     @Override
@@ -28,8 +28,9 @@ public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler
         if (exception != null) {
             object.put("error", new JsonError(exception));
         }
+
         if (envelope != null) {
-            object.put("envelope", new JsonMessageEnvelope(envelope, content, m));
+            object.put("envelope", new JsonMessageEnvelope(envelope, content, exception, m));
         }
 
         jsonWriter.write(object);