narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

do not return muc whispers as last markable message

Browse source
This commit is contained in:
Daniel Gultsch 2017-11-30 17:26:50 +01:00
parent 86f09dd9b9
commit b158e9fd42
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/entities/Conversation.java
View file

@ -470,7 +470,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
synchronized (this.messages) { synchronized (this.messages) {
for (int i = this.messages.size() - 1; i >= 0; --i) { for (int i = this.messages.size() - 1; i >= 0; --i) {
final Message message = this.messages.get(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; return message.isRead() ? null : message;
} }
} }