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 cb2025ab58ea2c9f1a9dc24a19f07d27b12e6296..02fc22ddf7b352e322176bddc91693db6e3dc023 100644 (file)
--- 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<String> attachments, byte[] groupId) throws EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, IOException;
 
     class MessageReceived extends DBusSignal {
     void sendGroupMessage(String message, List<String> attachments, byte[] groupId) throws EncapsulatedExceptions, GroupNotFoundException, AttachmentInvalidException, IOException;
 
     class MessageReceived extends DBusSignal {

-        public MessageReceived(String objectpath, String sender, byte[] groupId, String message, List<String> attachments) throws DBusException {
-            super(objectpath, sender, groupId, message, attachments);
+        private long timestamp;
+        private String sender;
+        private byte[] groupId;
+        private String message;
+        private List<String> attachments;
+
+        public MessageReceived(String objectpath, long timestamp, String sender, byte[] groupId, String message, List<String> 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<String> getAttachments() {
+            return attachments;

         }
     }
 }
         }
     }
 }

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index a79c3c7d24932f25ae2c3fa272cf71bb0716ddd2..d562c4e1ad11279419a8efc1a40957a740ae383c 100644 (file)
--- 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,
                     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() : "",
                                 envelope.getSource(),
                                 message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
                                 message.getBody().isPresent() ? message.getBody().get() : "",