moparisthebest
/
Conversations
mirror of https://github.com/moparisthebest/Conversations
1
0
Fork 0
Code Issues Releases Wiki Activity

code cleanup and synchronized getMarkableMessage()

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() {
for (int i = this.messages.size() - 1; i >= 0; --i) {
if (this.messages.get(i).getStatus() <= Message.STATUS_RECEIVED
&& this.messages.get(i).markable) {
if (this.messages.get(i).isRead()) {
return null;
} else {
return this.messages.get(i);
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) {
return message.isRead() ? null : message;
}
}
}
}
return null;
}