From 8bda54d48c185a1ce7787080fe6223d47377d55e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Sat, 3 Jan 2015 00:47:22 +0100
Subject: code cleanup

---
 .../eu/siacs/conversations/services/MessageArchiveService.java   | 9 +++++++--
 .../eu/siacs/conversations/services/XmppConnectionService.java   | 4 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/services')

diff --git a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
index 3fef5703..82111243 100644
--- a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
+++ b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
@@ -24,7 +24,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 	private final XmppConnectionService mXmppConnectionService;
 
 	private final HashSet<Query> queries = new HashSet<Query>();
-	private ArrayList<Query> pendingQueries = new ArrayList<Query>();
+	private final ArrayList<Query> pendingQueries = new ArrayList<Query>();
 
 	public enum PagingOrder {
 		NORMAL,
@@ -134,6 +134,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 			if (conversation.setLastMessageTransmitted(query.getEnd())) {
 				this.mXmppConnectionService.databaseBackend.updateConversation(conversation);
 			}
+			conversation.setHasMessagesLeftOnServer(query.getMessageCount() > 0);
 			if (query.hasCallback()) {
 				query.callback();
 			} else {
@@ -300,7 +301,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 		public void callback() {
 			if (this.callback != null) {
 				this.callback.onMoreMessagesLoaded(messageCount,conversation);
-				if (messageCount==0) {
+				if (messageCount == 0) {
 					this.callback.informUser(R.string.no_more_history_on_server);
 				}
 			}
@@ -330,6 +331,10 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 			return this.totalCount;
 		}
 
+		public int getMessageCount() {
+			return this.messageCount;
+		}
+
 		@Override
 		public String toString() {
 			StringBuilder builder = new StringBuilder();
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);
-- 
cgit v1.2.3