Fix flagging no more messages on server for conversation

1 files changed, 12 insertions, 1 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationMoreMessagesLoadedListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationMoreMessagesLoadedListener.java
index 774e72ba..859a6069 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationMoreMessagesLoadedListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationMoreMessagesLoadedListener.java
@@ -29,16 +29,24 @@ public class ConversationMoreMessagesLoadedListener implements XmppConnectionSer
     The current loading status
      */
     private boolean loadingMessages = false;
+    /**
+     * Whether the user is loading only history messages or not.
+     * History messages are messages which are older than the oldest in the database.
+     */
+    private boolean loadHistory = true;
 
     public ConversationMoreMessagesLoadedListener(SwipyRefreshLayout swipeLayout, List<Message> messageList, ConversationFragment fragment, ListView messagesView, MessageAdapter messageListAdapter) {
         this.swipeLayout = swipeLayout;
         this.messageList = messageList;
-
         this.fragment = fragment;
         this.messagesView = messagesView;
         this.messageListAdapter = messageListAdapter;
     }
 
+    public void setLoadHistory(boolean value) {
+        this.loadHistory = value;
+    }
+
     public void setLoadingInProgress() {
         this.loadingMessages = true;
     }
@@ -62,6 +70,9 @@ public class ConversationMoreMessagesLoadedListener implements XmppConnectionSer
         }
         // No new messages are loaded
         if (0 == c) {
+            if (this.loadHistory) {
+                conversation.setHasMessagesLeftOnServer(false);
+            }
             activity.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {