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

make lastMessageTransmitted return max(clear_date,last_message)

Browse source
This commit is contained in:
Daniel Gultsch 2016-08-13 12:36:30 +02:00
parent eb8b6165d7
commit 4736d12e99
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -803,19 +803,18 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
}
public long getLastMessageTransmitted() {
long last_clear = getLastClearHistory();
if (last_clear != 0) {
return last_clear;
}
final long last_clear = getLastClearHistory();
long last_received = 0;
synchronized (this.messages) {
for(int i = this.messages.size() - 1; i >= 0; --i) {
Message message = this.messages.get(i);
if (message.getStatus() == Message.STATUS_RECEIVED || message.isCarbon()) {
return message.getTimeSent();
last_received = message.getTimeSent();
break;
}
}
}
return 0;
return Math.max(last_clear,last_received);
}
public void setMutedTill(long value) {