X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/ce7aa580b6f0580cdcf7fd68fcc8efba737d21ed..2ab42ca5471e8fc1e1a31cde954e19564178f114:/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 96f4acb5..1135e89a 100644 --- a/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java +++ b/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java @@ -3,10 +3,9 @@ package org.asamk.signal; import org.asamk.signal.json.JsonError; import org.asamk.signal.json.JsonMessageEnvelope; import org.asamk.signal.manager.Manager; +import org.asamk.signal.manager.api.MessageEnvelope; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.whispersystems.signalservice.api.messages.SignalServiceContent; -import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope; import java.util.HashMap; @@ -23,14 +22,14 @@ public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler } @Override - public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) { + public void handleMessage(MessageEnvelope envelope, Throwable exception) { final var object = new HashMap(); if (exception != null) { object.put("error", JsonError.from(exception)); } if (envelope != null) { - object.put("envelope", JsonMessageEnvelope.from(envelope, content, exception, m)); + object.put("envelope", JsonMessageEnvelope.from(envelope, exception, m)); } jsonWriter.write(object);