From 8f771c2eacff5b86ec027853be4745e7d6ea73ea Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Thu, 13 Apr 2017 21:58:05 +0200 Subject: show first instead of last message in notification preview --- .../de/pixart/messenger/services/NotificationService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java index 25b87f761..e7ae8d3a0 100644 --- a/src/main/java/de/pixart/messenger/services/NotificationService.java +++ b/src/main/java/de/pixart/messenger/services/NotificationService.java @@ -228,7 +228,9 @@ public class NotificationService { if (messages != null && messages.size() > 0) { Message last = messages.get(messages.size() - 1); if (last.getStatus() != Message.STATUS_RECEIVED) { - mXmppConnectionService.markRead(last.getConversation(), false); + if (mXmppConnectionService.markRead(last.getConversation(), false)) { + mXmppConnectionService.updateConversationUi(); + } } } } @@ -440,7 +442,7 @@ public class NotificationService { } else { if (messages.get(0).getConversation().getMode() == Conversation.MODE_SINGLE) { builder.setStyle(new NotificationCompat.BigTextStyle().bigText(getMergedBodies(messages))); - builder.setContentText(UIHelper.getMessagePreview(mXmppConnectionService, messages.get((messages.size() - 1))).first); + builder.setContentText(UIHelper.getMessagePreview(mXmppConnectionService, messages.get(0)).first); } else { final NotificationCompat.InboxStyle style = new NotificationCompat.InboxStyle(); SpannableString styledString; @@ -500,11 +502,11 @@ public class NotificationService { private CharSequence getMergedBodies(final ArrayList messages) { final StringBuilder text = new StringBuilder(); - for (int i = 0; i < messages.size(); ++i) { - text.append(UIHelper.getMessagePreview(mXmppConnectionService, messages.get(i)).first); - if (i != messages.size() - 1) { + for(Message message : messages) { + if (text.length() != 0) { text.append("\n"); } + text.append(UIHelper.getMessagePreview(mXmppConnectionService, message).first); } return text.toString(); } -- cgit v1.2.3