mirror of
https://github.com/AsamK/signal-cli
synced 2025-09-07 06:20:39 +00:00
Refactor receive api
This commit is contained in:
parent
b615a4b04d
commit
9075cc1a30
36 changed files with 1510 additions and 970 deletions
|
@ -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<String, Object>();
|
||||
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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue