aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-10-09 10:49:30 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-10-09 10:49:30 +0200
commitef605e4cbd162d48e40d13d91b188b9838de308d (patch)
tree6ed0dc07626930b54c25c392f2186a2616e516a3 /src/main/java
parente65068d2267246962b9764d86eb3a906e3dde68f (diff)
do not dismiss editAccountActivity when still trying to register new account
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 4d8a5ace..00e3a0f9 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -152,7 +152,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
mAccount.setOption(Account.OPTION_REGISTER, registerNewAccount);
xmppConnectionService.createAccount(mAccount);
}
- if (jidToEdit != null && !mAccount.isOptionSet(Account.OPTION_DISABLED)) {
+ if (jidToEdit != null
+ && !mAccount.isOptionSet(Account.OPTION_DISABLED)
+ && !registerNewAccount) {
finish();
} else {
updateSaveButton();