1 files changed, 19 insertions, 9 deletions

diff --git a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
index 06df1b38..613d7150 100644
--- a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
+++ b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
@@ -1,6 +1,5 @@
 package eu.siacs.conversations.services;
 
-import android.util.Log;
 import android.util.Pair;
 
 import java.math.BigInteger;
@@ -9,6 +8,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 
+import de.thedevstack.android.logcat.Logging;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
@@ -30,7 +30,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 	public enum PagingOrder {
 		NORMAL,
 		REVERSE
-	}
+	};
 
 	public MessageArchiveService(final XmppConnectionService service) {
 		this.mXmppConnectionService = service;
@@ -97,6 +97,10 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 	}
 
     public Query query(Conversation conversation, long start, long end) {
+       return this.query(conversation, start, end, null);
+    }
+
+    public Query query(Conversation conversation, long start, long end, XmppConnectionService.OnMoreMessagesLoaded callback) {
         synchronized (this.queries) {
             if (start > end) {
                 return null;
@@ -104,6 +108,9 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
             final Query query = new Query(conversation, start, end,PagingOrder.REVERSE);
             query.reference = conversation.getFirstMamReference();
             this.queries.add(query);
+            if (null != callback) {
+                query.setCallback(callback);
+            }
             this.execute(query);
             return query;
         }
@@ -128,7 +135,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 	private void execute(final Query query) {
 		final Account account=  query.getAccount();
 		if (account.getStatus() == Account.State.ONLINE) {
-			Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": running mam query " + query.toString());
+			Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": running mam query " + query.toString());
 			IqPacket packet = this.mXmppConnectionService.getIqGenerator().queryMessageArchiveManagement(query);
 			this.mXmppConnectionService.sendIqPacket(account, packet, new OnIqPacketReceived() {
 				@Override
@@ -137,11 +144,11 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 						synchronized (MessageArchiveService.this.queries) {
 							MessageArchiveService.this.queries.remove(query);
 							if (query.hasCallback()) {
-								query.callback(false);
+								query.callback();
 							}
 						}
 					} else if (packet.getType() != IqPacket.TYPE.RESULT) {
-						Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": error executing mam: " + packet.toString());
+						Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": error executing mam: " + packet.toString());
 						finalizeQuery(query, true);
 					}
 				}
@@ -169,8 +176,11 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 			}
 		}
 		if (query.hasCallback()) {
-			query.callback(done);
+			query.callback();
 		} else {
+            if (null != conversation) {
+                conversation.setHasMessagesLeftOnServer(query.getMessageCount() > 0);
+            }
 			this.mXmppConnectionService.updateConversationUi();
 		}
 	}
@@ -213,7 +223,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 		if (complete || relevant == null || abort) {
 			final boolean done = (complete || query.getMessageCount() == 0) && query.getStart() == 0;
 			this.finalizeQuery(query, done);
-			Log.d(Config.LOGTAG,query.getAccount().getJid().toBareJid()+": finished mam after "+query.getTotalCount()+" messages. messages left="+Boolean.toString(!done));
+			Logging.d(Config.LOGTAG,query.getAccount().getJid().toBareJid()+": finished mam after "+query.getTotalCount()+" messages. messages left="+Boolean.toString(!done));
 			if (query.getWith() == null && query.getMessageCount() > 0) {
 				mXmppConnectionService.getNotificationService().finishBacklog(true);
 			}
@@ -332,10 +342,10 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 			this.callback = callback;
 		}
 
-		public void callback(boolean done) {
+		public void callback() {
 			if (this.callback != null) {
 				this.callback.onMoreMessagesLoaded(messageCount,conversation);
-				if (done) {
+				if (messageCount <= 0) {
 					this.callback.informUser(R.string.no_more_history_on_server);
 				}
 			}