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

code cleanup and synchronized getMarkableMessage()

Browse source
This commit is contained in:
Daniel Gultsch 2017-08-09 09:43:41 +02:00
parent 995d975127
commit d8d1c1192f
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -456,15 +456,13 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
} }
public Message getLatestMarkableMessage() { public Message getLatestMarkableMessage() {
for (int i = this.messages.size() - 1; i >= 0; --i) { synchronized (this.messages) {
if (this.messages.get(i).getStatus() <= Message.STATUS_RECEIVED for (int i = this.messages.size() - 1; i >= 0; --i) {
&& this.messages.get(i).markable) { final Message message = this.messages.get(i);
if (this.messages.get(i).isRead()) { if (message.getStatus() <= Message.STATUS_RECEIVED && message.markable) {
return null; return message.isRead() ? null : message;
} else {
return this.messages.get(i);
} }
} }
} }
return null; return null;
} }