diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-04-13 22:49:12 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-04-13 22:49:12 +0200 |
| commit | abb8c7eff998c16f50cbe9bf37eb255be8f3058b (patch) | |
| tree | f90d050db40ab3fdddf34c9f648df8fa6cd26de3 /src/main/java/de/pixart/messenger/ui/StartConversationActivity.java | |
| parent | 6f4061521657d1c31bbf28c3b8b3efc4eb59138f (diff) | |
use async message loading only when called from UI
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/StartConversationActivity.java | 10 |
1 files changed, 5 insertions, 5 deletions
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); } |