gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve message timestamps

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-08-23 15:50:58 +02:00
parent 8f311ae3bc
commit 9cb72de8e8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
View File

@ -203,6 +203,8 @@ public class NotificationWorker extends Worker {
HashMap<String, HashMap<String, String>> subjectRichParameters = notification HashMap<String, HashMap<String, String>> subjectRichParameters = notification
.getSubjectRichParameters(); .getSubjectRichParameters();
decryptedPushMessage.setTimestamp(notification.getDatetime().getTime();
if (subjectRichParameters != null && subjectRichParameters.size() > 0) { if (subjectRichParameters != null && subjectRichParameters.size() > 0) {
HashMap<String, String> callHashMap = subjectRichParameters.get("call"); HashMap<String, String> callHashMap = subjectRichParameters.get("call");
HashMap<String, String> userHashMap = subjectRichParameters.get("user"); HashMap<String, String> userHashMap = subjectRichParameters.get("user");
@ -286,7 +288,7 @@ public class NotificationWorker extends Worker {
.setCategory(category) .setCategory(category)
.setPriority(priority) .setPriority(priority)
.setSubText(baseUrl) .setSubText(baseUrl)
.setWhen(Calendar.getInstance().getTimeInMillis()) .setWhen(decryptedPushMessage.getTimestamp())
.setShowWhen(true) .setShowWhen(true)
.setContentTitle(decryptedPushMessage.getSubject()) .setContentTitle(decryptedPushMessage.getSubject())
.setContentIntent(pendingIntent) .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()))); 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; return newStyle;
} }

3
app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java
View File

@ -56,4 +56,7 @@ public class DecryptedPushMessage {
@JsonIgnore @JsonIgnore
String text; String text;
@JsonIgnore
long timestamp;
} }