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/ConferenceDetailsActivity.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/ConferenceDetailsActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index 8c4f6eaf..07b8819d 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -385,6 +385,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers @Override void onBackendConnected() { + if (mPendingConferenceInvite != null) { + mPendingConferenceInvite.execute(this); + mPendingConferenceInvite = null; + } if (getIntent().getAction().equals(ACTION_VIEW_MUC)) { this.uuid = getIntent().getExtras().getString("uuid"); } |