aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-12-06 16:21:39 +0100
committersteckbrief <steckbrief@chefmail.de>2015-12-06 16:21:39 +0100
commitaa6a2e1c182858e7bcc077f5220546e08df12ec1 (patch)
tree12cce9117bfa7bda7dc78b9809f772e0439fc7c7 /src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
parent734511b0fa15fa6ceb88c6b0ab4791139f7ffc8d (diff)
parenteb5a7a5392ec93976d91d5576a3496ceac473d03 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/MessageArchiveService.java')
-rw-r--r--src/main/java/eu/siacs/conversations/services/MessageArchiveService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
index 6cbb43d6..58d59288 100644
--- a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
+++ b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
@@ -134,10 +134,10 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
if (conversation.setLastMessageTransmitted(query.getEnd())) {
this.mXmppConnectionService.databaseBackend.updateConversation(conversation);
}
- conversation.setHasMessagesLeftOnServer(query.getMessageCount() > 0);
if (query.hasCallback()) {
query.callback();
} else {
+ conversation.setHasMessagesLeftOnServer(query.getMessageCount() > 0);
this.mXmppConnectionService.updateConversationUi();
}
} else {