use async message loading only when called from UI

3 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 2050a6ddc..ae40e6064 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -493,7 +493,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 
     protected void startConversation(User user) {
         if (user.getRealJid() != null) {
-            Conversation conversation = xmppConnectionService.findOrCreateConversation(this.mConversation.getAccount(), user.getRealJid().toBareJid(), false);
+            Conversation conversation = xmppConnectionService.findOrCreateConversation(this.mConversation.getAccount(), user.getRealJid().toBareJid(), false, true);
             switchToConversation(conversation);
         }
     }
diff --git a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
index c2cf95241..f8a414102 100644
--- a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java
@@ -301,7 +301,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer
 
             try {
                 conversation = xmppConnectionService
-                        .findOrCreateConversation(account, Jid.fromString(share.contact), false);
+                        .findOrCreateConversation(account, Jid.fromString(share.contact), false, true);
             } catch (final InvalidJidException e) {
                 return;
             }
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 93663bda5..f3cbf7be9 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -331,7 +331,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
     protected void openConversationForContact(Contact contact) {
         Conversation conversation = xmppConnectionService
                 .findOrCreateConversation(contact.getAccount(),
-                        contact.getJid(), false);
+                        contact.getJid(), false, true);
         switchToConversation(conversation);
     }
 
@@ -372,7 +372,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
             Toast.makeText(this, R.string.invalid_jid, Toast.LENGTH_SHORT).show();
             return;
         }
-        Conversation conversation = xmppConnectionService.findOrCreateConversation(bookmark.getAccount(), jid, true, true);
+        Conversation conversation = xmppConnectionService.findOrCreateConversation(bookmark.getAccount(), jid, true, true, true);
         conversation.setBookmark(bookmark);
         if (!bookmark.autojoin() && getPreferences().getBoolean("autojoin", true)) {
             bookmark.setAutojoin(true);
@@ -528,7 +528,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
                                 account.getBookmarks().add(bookmark);
                                 xmppConnectionService.pushBookmarks(account);
                                 final Conversation conversation = xmppConnectionService
-                                        .findOrCreateConversation(account, conferenceJid, true, true);
+                                        .findOrCreateConversation(account, conferenceJid, true, true, true);
                                 conversation.setBookmark(bookmark);
                                 dialog.dismiss();
                                 mCurrentDialog = null;
@@ -536,7 +536,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
                             }
                         } else {
                             final Conversation conversation = xmppConnectionService
-                                    .findOrCreateConversation(account,conferenceJid, true, true);
+                                    .findOrCreateConversation(account,conferenceJid, true, true, true);
                             dialog.dismiss();
                             mCurrentDialog = null;
                             switchToConversation(conversation);
@@ -597,7 +597,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
     protected void switchToConversation(Contact contact, String body) {
         Conversation conversation = xmppConnectionService
                 .findOrCreateConversation(contact.getAccount(),
-                        contact.getJid(), false);
+                        contact.getJid(), false, true);
         switchToConversation(conversation, body, false);
     }