aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-03-29 22:30:13 +0200
committersteckbrief <steckbrief@chefmail.de>2016-03-29 22:30:13 +0200
commitbcf0d929dda50a3c8c94e5d384840bedc51d4e63 (patch)
tree6b83ca71ab6743aa7f08eed46323cc5125d6c710 /src/main/java/de
parent1d5d94080a6bffaf5fa7c358af76a3cfae0a8ade (diff)
Avoid unnecessary text change on activate account button
Diffstat (limited to '')
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java
index 33b73a32..abb43c4e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java
@@ -118,6 +118,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
}
if (mAccount != null && mAccount.getStatus() == Account.State.DISABLED && !accountInfoEdited()) {
mAccount.setOption(Account.OPTION_DISABLED, false);
+ mAccount.setStatus(Account.State.CONNECTING);
xmppConnectionService.updateAccount(mAccount);
return;
}
@@ -544,8 +545,8 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
getActionBar().setDisplayHomeAsUpEnabled(false);
getActionBar().setDisplayShowHomeEnabled(false);
getActionBar().setHomeButtonEnabled(false);
- }
- TextViewUtil.disable(mCancelButton, ConversationsPlusColors.secondaryText());
+ }
+ TextViewUtil.disable(mCancelButton, ConversationsPlusColors.secondaryText());
}
if (Config.DOMAIN_LOCK == null) {
final KnownHostsAdapter mKnownHostsAdapter = new KnownHostsAdapter(this,