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

sync around Conversation.getLatestMessage()

Browse source
This commit is contained in:
Daniel Gultsch 2017-07-11 23:09:51 +02:00
parent 4d1b6d4404
commit 8de81e0bc8
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -470,13 +470,15 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
} }
public Message getLatestMessage() { public Message getLatestMessage() {
if (this.messages.size() == 0) { synchronized (this.messages) {
Message message = new Message(this, "", Message.ENCRYPTION_NONE); if (this.messages.size() == 0) {
message.setType(Message.TYPE_STATUS); Message message = new Message(this, "", Message.ENCRYPTION_NONE);
message.setTime(Math.max(getCreated(),getLastClearHistory().getTimestamp())); message.setType(Message.TYPE_STATUS);
return message; message.setTime(Math.max(getCreated(), getLastClearHistory().getTimestamp()));
} else { return message;
return this.messages.get(this.messages.size() - 1); } else {
return this.messages.get(this.messages.size() - 1);
}
} }
} }