moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-24 09:42:17 -05:00
Code Issues Releases 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

12
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

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