X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/30690785fd51f9ba841f6f57d5f403bd970f26e3..8bcd8d87d219ae0496986cba4bd6b89f3b2ad6f6:/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java diff --git a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java index 4deeefd3..9433d209 100644 --- a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java +++ b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java @@ -21,8 +21,10 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler { private final String objectPath; - public JsonDbusReceiveMessageHandler(Manager m, DBusConnection conn, final String objectPath) { - super(m); + public JsonDbusReceiveMessageHandler( + Manager m, JsonWriter jsonWriter, DBusConnection conn, final String objectPath + ) { + super(m, jsonWriter); this.conn = conn; this.objectPath = objectPath; } @@ -43,7 +45,7 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler { e.printStackTrace(); } } else if (content != null) { - final var sender = !envelope.isUnidentifiedSender() && envelope.hasSource() + final var sender = !envelope.isUnidentifiedSender() && envelope.hasSourceUuid() ? envelope.getSourceAddress() : content.getSender(); if (content.getReceiptMessage().isPresent()) {