diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-10-05 13:18:18 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-10-05 13:18:18 +0200 |
| commit | bf893bee083136f7adfee5671c60a789fd030bb1 (patch) | |
| tree | 3e23a2f90c676a4c5d2ac1487b8e412394e7044a /src | |
| parent | 4a260baa1223c691e3c2909d7a4c975d0c5a3225 (diff) | |
| parent | 5250ef536fe3f5abffd87fe25981aa0bcd85115b (diff) | |
Merge pull request #523 from betheg/leaked_window
fixed an 'activity has leaked window'
Diffstat (limited to 'src')
| -rw-r--r-- | src/eu/siacs/conversations/ui/StartConversationActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/ui/StartConversationActivity.java b/src/eu/siacs/conversations/ui/StartConversationActivity.java index 1a5fba95..830bf252 100644 --- a/src/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/eu/siacs/conversations/ui/StartConversationActivity.java @@ -359,8 +359,8 @@ public class StartConversationActivity extends XmppActivity { jid.setError(getString(R.string.contact_already_exists)); } else { xmppConnectionService.createContact(contact); - switchToConversation(contact); dialog.dismiss(); + switchToConversation(contact); } } else { jid.setError(getString(R.string.invalid_jid)); @@ -421,6 +421,7 @@ public class StartConversationActivity extends XmppActivity { xmppConnectionService .joinMuc(conversation); } + dialog.dismiss(); switchToConversation(conversation); } } else { @@ -430,6 +431,7 @@ public class StartConversationActivity extends XmppActivity { if (!conversation.getMucOptions().online()) { xmppConnectionService.joinMuc(conversation); } + dialog.dismiss(); switchToConversation(conversation); } } else { |