From 2168c737860757051e4482dc7e874e10b840da6b Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Fri, 12 Feb 2016 19:28:29 +0100
Subject: Fixed NPE while loading messages via MAM

---
 .../java/eu/siacs/conversations/services/MessageArchiveService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
index 4400105e..ddaaa844 100644
--- a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
+++ b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
@@ -161,6 +161,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 		final Conversation conversation = query.getConversation();
 		if (conversation != null) {
 			conversation.sort();
+			conversation.setHasMessagesLeftOnServer(query.getMessageCount() > 0);
 		} else {
 			for(Conversation tmp : this.mXmppConnectionService.getConversations()) {
 				if (tmp.getAccount() == query.getAccount()) {
@@ -171,7 +172,6 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 		if (query.hasCallback()) {
 			query.callback();
 		} else {
-			conversation.setHasMessagesLeftOnServer(query.getMessageCount() > 0);
 			this.mXmppConnectionService.updateConversationUi();
 		}
 	}
-- 
cgit v1.2.3