diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-05-12 04:33:04 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-05-12 04:33:04 +0200 |
| commit | d3a6aa9f7a3132f8f67f2de99b4afbaba7823abb (patch) | |
| tree | acef390cfe7aa8489f60dd1c36b2381698f1cf25 /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | |
| parent | 93e444ac3ad4b39415d7097566c319904ff14bcd (diff) | |
handle conference invites differently to deal with killed activities. fixes #1188
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 6e175d8e..a2a405c3 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -901,6 +901,12 @@ public class ConversationActivity extends XmppActivity void onBackendConnected() { this.xmppConnectionService.getNotificationService().setIsInForeground(true); updateConversationList(); + + if (mPendingConferenceInvite != null) { + mPendingConferenceInvite.execute(this); + mPendingConferenceInvite = null; + } + if (xmppConnectionService.getAccounts().size() == 0) { if (!mRedirected) { this.mRedirected = true; |