From 9cb72de8e811349f27e66f3e4ca865b43a76f1f7 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Fri, 23 Aug 2019 15:50:58 +0200
Subject: [PATCH] Improve message timestamps

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../java/com/nextcloud/talk/jobs/NotificationWorker.java    | 6 ++++--
 .../talk/models/json/push/DecryptedPushMessage.java         | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
index 79f11d9c7..36ac57452 100644
--- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
+++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
@@ -203,6 +203,8 @@ public class NotificationWorker extends Worker {
                         HashMap<String, HashMap<String, String>> subjectRichParameters = notification
                                 .getSubjectRichParameters();
 
+                        decryptedPushMessage.setTimestamp(notification.getDatetime().getTime();
+
                         if (subjectRichParameters != null && subjectRichParameters.size() > 0) {
                             HashMap<String, String> callHashMap = subjectRichParameters.get("call");
                             HashMap<String, String> userHashMap = subjectRichParameters.get("user");
@@ -286,7 +288,7 @@ public class NotificationWorker extends Worker {
                 .setCategory(category)
                 .setPriority(priority)
                 .setSubText(baseUrl)
-                .setWhen(Calendar.getInstance().getTimeInMillis())
+                .setWhen(decryptedPushMessage.getTimestamp())
                 .setShowWhen(true)
                 .setContentTitle(decryptedPushMessage.getSubject())
                 .setContentIntent(pendingIntent)
@@ -426,7 +428,7 @@ public class NotificationWorker extends Worker {
                 style.getMessages().forEach(message -> newStyle.addMessage(new NotificationCompat.MessagingStyle.Message(message.getText(), message.getTimestamp(), message.getPerson())));
             }
 
-            newStyle.addMessage(decryptedPushMessage.getText(), System.currentTimeMillis(), person);
+            newStyle.addMessage(decryptedPushMessage.getText(), decryptedPushMessage.getTimestamp(), person);
             return newStyle;
         }
 
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java
index 0f2c94bb5..c65033069 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java
@@ -56,4 +56,7 @@ public class DecryptedPushMessage {
 
     @JsonIgnore
     String text;
+
+    @JsonIgnore
+    long timestamp;
 }