mirror of
https://github.com/moparisthebest/Conversations
synced 2024-11-30 20:52:21 -05:00
Merge pull request #523 from betheg/leaked_window
fixed an 'activity has leaked window'
This commit is contained in:
commit
bf893bee08
@ -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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user