aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-12-13 15:32:11 +0100
committeriNPUTmice <daniel@gultsch.de>2014-12-13 15:32:11 +0100
commit899802646cbf27622c1eef8c941a84fd60af2424 (patch)
treef17b6f19bfa8cee247f87a752408a9ae34fbac6b /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
parent02a89f4ce2228c2e0f528f89fa1fe850c6f50fe8 (diff)
reverse through mam history when loading larger chuncks
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 16a92d4f..43e4a377 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -956,6 +956,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
}
public int loadMoreMessages(Conversation conversation, long timestamp) {
+ if (this.getMessageArchiveService().queryInProgress(conversation)) {
+ return 0;
+ }
List<Message> messages = databaseBackend.getMessages(conversation, 50,
timestamp);
for (Message message : messages) {