Fix flagging no more messages on server for conversation

1 files changed, 2 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java
index c6e00bed..bd616691 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java
@@ -43,6 +43,7 @@ public class ConversationSwipeRefreshListener implements SwipyRefreshLayout.OnRe
                     timestamp = this.messageList.get(0).getTimeSent(); // works only because of the ordering (last msg = first msg in list)
                 }
                 ConversationActivity activity = (ConversationActivity) fragment.getActivity();
+                this.listener.setLoadHistory(true);
                 activity.xmppConnectionService.loadMoreMessages(activity.getSelectedConversation(), timestamp, this.listener);
             } else if (SwipyRefreshLayoutDirection.BOTTOM == direction) {
                 Logging.d("mam", "loading missing messages from mam (last session establishing or last received message)");
@@ -53,6 +54,7 @@ public class ConversationSwipeRefreshListener implements SwipyRefreshLayout.OnRe
                 long startTimestamp = Math.min(lastSessionEstablished, lastReceivedMessage);
                 MessageArchiveService.Query query = activity.xmppConnectionService.getMessageArchiveService().query(activity.getSelectedConversation(), startTimestamp, System.currentTimeMillis());
                 if (query != null) {
+                    this.listener.setLoadHistory(false);
                     query.setCallback(this.listener);
                 } else {
                     activity.runOnUiThread(new Runnable() {