diff options
author | Daniel Gultsch <inputmice@siacs.eu> | 2015-01-03 00:47:22 +0100 |
---|---|---|
committer | Daniel Gultsch <inputmice@siacs.eu> | 2015-01-03 00:47:22 +0100 |
commit | 8bda54d48c185a1ce7787080fe6223d47377d55e (patch) | |
tree | 7e91ea7226a172d684f9e43f5449e3289cee1cec /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
parent | 969044b1133fa2fd82d209953a1970a2a5b2eb97 (diff) |
code cleanup
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index bdc51783..ec904fbb 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -971,7 +971,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa if (messages.size() > 0) { conversation.addAll(0, messages); callback.onMoreMessagesLoaded(messages.size(), conversation); - } else if (account.getStatus() == Account.State.ONLINE && account.getXmppConnection() != null && account.getXmppConnection().getFeatures().mam()) { + } else if (conversation.hasMessagesLeftOnServer() + && account.isOnlineAndConnected() + && account.getXmppConnection().getFeatures().mam()) { MessageArchiveService.Query query = getMessageArchiveService().query(conversation,0,timestamp - 1); if (query != null) { query.setCallback(callback); |