From cab10ff1019eb754b389c2d47f2192c05a523f00 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 1 Dec 2017 21:51:24 +0100 Subject: do not return muc whispers as last markable message --- src/main/java/de/pixart/messenger/entities/Conversation.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index 59611713b..9252842aa 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -484,7 +484,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl synchronized (this.messages) { for (int i = this.messages.size() - 1; i >= 0; --i) { final Message message = this.messages.get(i); - if (message.getStatus() <= Message.STATUS_RECEIVED && message.markable) { + if (message.getStatus() <= Message.STATUS_RECEIVED + && message.markable + && message.getType() != Message.TYPE_PRIVATE) { return message.isRead() ? null : message; } } -- cgit v1.2.3