aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-02-12 19:28:29 +0100
committersteckbrief <steckbrief@chefmail.de>2016-02-12 19:28:29 +0100
commit2168c737860757051e4482dc7e874e10b840da6b (patch)
treeddd109f5411c7999ff9451722a2e18724784903e /src/main
parent97749cd8f7ad59ad8ce48073c2d8f1b3695d5986 (diff)
Fixed NPE while loading messages via MAM
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/services/MessageArchiveService.java2
1 files changed, 1 insertions, 1 deletions
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();
}
}