From 3522243835fd29751109cb578897b4e403f06b7d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Sun, 4 Jan 2015 18:16:55 +0100
Subject: do not run mam queries in findOrCreateConversation() when isn't
 available

---
 .../siacs/conversations/services/XmppConnectionService.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index beba97fe4..59cb3bb23 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -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);
-- 
cgit v1.2.3