Add new dbus message received signals with extendable extras map

[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 4cade79974c751ace9a818b9499ad9fb4a7a7931..96f4acb52d21738ee962c303882555da9fccf60c 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java
@@ -26,10 +26,11 @@ public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler
     public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
         final var object = new HashMap<String, Object>();
         if (exception != null) {
     public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
         final var object = new HashMap<String, Object>();
         if (exception != null) {

-            object.put("error", new JsonError(exception));
+            object.put("error", JsonError.from(exception));

         }
         }

+

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

-            object.put("envelope", new JsonMessageEnvelope(envelope, content, m));
+            object.put("envelope", JsonMessageEnvelope.from(envelope, content, exception, m));

         }
 
         jsonWriter.write(object);
         }
 
         jsonWriter.write(object);