From b158e9fd4229cb32d02d8d0139efaaa96a709615 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 30 Nov 2017 17:26:50 +0100 Subject: [PATCH] do not return muc whispers as last markable message --- .../java/eu/siacs/conversations/entities/Conversation.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 2c4b0395e..cce8a7468 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -470,7 +470,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; } }