From: AsamK Date: Sun, 27 Mar 2016 21:35:36 +0000 (+0200) Subject: Add timestamp to dbus MessageReceived signal X-Git-Tag: v0.3.0~3 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/af8a27e87f7844e733d1b42419c3976f0b41ae58?ds=inline Add timestamp to dbus MessageReceived signal --- diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java index cb2025ab..02fc22dd 100644 --- a/src/main/java/org/asamk/Signal.java +++ b/src/main/java/org/asamk/Signal.java @@ -20,8 +20,39 @@ public interface Signal extends DBusInterface { void sendGroupMessage(String message, List attachments, byte[] groupId) throws EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, IOException; class MessageReceived extends DBusSignal { - public MessageReceived(String objectpath, String sender, byte[] groupId, String message, List attachments) throws DBusException { - super(objectpath, sender, groupId, message, attachments); + private long timestamp; + private String sender; + private byte[] groupId; + private String message; + private List attachments; + + public MessageReceived(String objectpath, long timestamp, String sender, byte[] groupId, String message, List attachments) throws DBusException { + super(objectpath, timestamp, sender, groupId, message, attachments); + this.timestamp = timestamp; + this.sender = sender; + this.groupId = groupId; + this.message = message; + this.attachments = attachments; + } + + public long getTimestamp() { + return timestamp; + } + + public String getSender() { + return sender; + } + + public byte[] getGroupId() { + return groupId; + } + + public String getMessage() { + return message; + } + + public List getAttachments() { + return attachments; } } } diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java index a79c3c7d..d562c4e1 100644 --- a/src/main/java/org/asamk/signal/Main.java +++ b/src/main/java/org/asamk/signal/Main.java @@ -603,6 +603,7 @@ public class Main { try { conn.sendSignal(new Signal.MessageReceived( SIGNAL_OBJECTPATH, + message.getTimestamp(), envelope.getSource(), message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0], message.getBody().isPresent() ? message.getBody().get() : "",