diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-11-23 20:36:46 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-11-23 20:36:46 +0100 |
| commit | efd0ca9dd0569db2da2dfea7734f421ff923c72b (patch) | |
| tree | e3b1e2bf22f506d4b7c23ab49ac409d3a357b561 | |
| parent | 4a88a5393cc413f9e7e9e3f72cd7eaf1b4f33bd4 (diff) | |
MAM: start muc catchup with last sent message if serverId is available
| -rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index 4a9a77a19..59611713b 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -874,7 +874,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl 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()) { + if (message.getStatus() == Message.STATUS_RECEIVED || message.isCarbon() || message.getServerMsgId() != null) { lastReceived = new MamReference(message.getTimeSent(),message.getServerMsgId()); break; } |