aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2017-11-30 17:26:50 +0100
committerDaniel Gultsch <daniel@gultsch.de>2017-11-30 17:26:50 +0100
commitb158e9fd4229cb32d02d8d0139efaaa96a709615 (patch)
tree3e7e3d4b8be6f22b2e188bc6c404d1338c2d8681
parent86f09dd9b9d9788e1b935dbb56fdac44277088f3 (diff)
do not return muc whispers as last markable message
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Conversation.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 2c4b039..cce8a74 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;
}
}