Merge pull request #523 from betheg/leaked_window

Daniel Gultsch created 11 years ago

fixed an 'activity has leaked window'

Change summary

src/eu/siacs/conversations/ui/StartConversationActivity.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Detailed changes

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 {