narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

do not run mam queries in findOrCreateConversation() when isn't available

Browse source
This commit is contained in:
Daniel Gultsch 2015-01-04 18:16:55 +01:00
parent e6cd92a663
commit 3522243835
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -1052,6 +1052,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
} }
this.databaseBackend.createConversation(conversation); this.databaseBackend.createConversation(conversation);
} }
if (account.getXmppConnection() != null && account.getXmppConnection().getFeatures().mam()) {
if (query == null) { if (query == null) {
this.mMessageArchiveService.query(conversation); this.mMessageArchiveService.query(conversation);
} else { } else {
@ -1059,6 +1060,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
this.mMessageArchiveService.query(conversation, query.getStart()); this.mMessageArchiveService.query(conversation, query.getStart());
} }
} }
}
this.conversations.add(conversation); this.conversations.add(conversation);
updateConversationUi(); updateConversationUi();
return conversation; return conversation;