sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #523 from betheg/leaked_window 

fixed an 'activity has leaked window'
This commit is contained in:
Daniel Gultsch 2014-10-05 13:18:18 +02:00
parent 4a260baa12 5250ef536f
commit bf893bee08
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/eu/siacs/conversations/ui/StartConversationActivity.java
View File

@ -359,8 +359,8 @@ public class StartConversationActivity extends XmppActivity {
jid.setError(getString(R.string.contact_already_exists)); jid.setError(getString(R.string.contact_already_exists));
} else { } else {
xmppConnectionService.createContact(contact); xmppConnectionService.createContact(contact);
switchToConversation(contact);
dialog.dismiss(); dialog.dismiss();
switchToConversation(contact);
} }
} else { } else {
jid.setError(getString(R.string.invalid_jid)); jid.setError(getString(R.string.invalid_jid));
@ -421,6 +421,7 @@ public class StartConversationActivity extends XmppActivity {
xmppConnectionService xmppConnectionService
.joinMuc(conversation); .joinMuc(conversation);
} }
dialog.dismiss();
switchToConversation(conversation); switchToConversation(conversation);
} }
} else { } else {
@ -430,6 +431,7 @@ public class StartConversationActivity extends XmppActivity {
if (!conversation.getMucOptions().online()) { if (!conversation.getMucOptions().online()) {
xmppConnectionService.joinMuc(conversation); xmppConnectionService.joinMuc(conversation);
} }
dialog.dismiss();
switchToConversation(conversation); switchToConversation(conversation);
} }
} else { } else {