Split receiveMessages method

[signal-cli] / 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 818f28814c0ac84db1526f10995f90b6559b5f97..73c88947c413abac3b3544d23673ef647ab61f05 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java
@@ -8,9 +8,7 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 

-import java.io.IOException;

 import java.util.HashMap;
 import java.util.HashMap;

-import java.util.Map;

 
 public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 
 
 public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 


@@ -19,24 +17,22 @@ public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler
     protected final Manager m;
     private final JsonWriter jsonWriter;
 
     protected final Manager m;
     private final JsonWriter jsonWriter;
 

-    public JsonReceiveMessageHandler(Manager m) {
+    public JsonReceiveMessageHandler(Manager m, JsonWriter jsonWriter) {

         this.m = m;
         this.m = m;

-        jsonWriter = new JsonWriter(System.out);
+        this.jsonWriter = jsonWriter;

     }
 
     @Override
     public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
     }
 
     @Override
     public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {

-        final Map<String, Object> object = new HashMap<>();
+        final var object = new HashMap<String, Object>();

         if (exception != null) {
             object.put("error", new JsonError(exception));
         }
         if (exception != null) {
             object.put("error", new JsonError(exception));
         }

+

         if (envelope != null) {
         if (envelope != null) {

-            object.put("envelope", new JsonMessageEnvelope(envelope, content, m));
-        }
-        try {
-            jsonWriter.write(object);
-        } catch (IOException e) {
-            logger.error("Failed to write json object: {}", e.getMessage());
+            object.put("envelope", new JsonMessageEnvelope(envelope, content, exception, m));

         }
         }

+
+        jsonWriter.write(object);

     }
 }
     }
 }