diff options
author | Christian Schneppe <christian@pix-art.de> | 2017-12-01 21:51:24 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2017-12-01 21:51:24 +0100 |
commit | cab10ff1019eb754b389c2d47f2192c05a523f00 (patch) | |
tree | 102d12a1107bc88a9b19bb088ecef88d89c85f41 /src | |
parent | d599b04ac3639da781062069a64fac68861f671d (diff) |
do not return muc whispers as last markable message
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java | 4 |
1 files changed, 3 insertions, 1 deletions
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; } } |