aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-04-19 18:03:24 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-04-19 18:03:24 +0200
commit1a073ca45455dcf46bb4d8bcaa962030a65c435a (patch)
tree4aa4e922970c6bba5860e19478488505b9c0f244 /src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
parentbfe01c432244e04daf6804d5cfc3b838ea247c4b (diff)
added magic create welcome screen
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/EditAccountActivity.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 48ccb9f0..b2c7f1a9 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -546,7 +546,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
}
updateAccountInformation(true);
}
- } else if (this.xmppConnectionService.getAccounts().size() == 0) {
+ }
+ if (this.xmppConnectionService.getAccounts().size() == 0
+ || this.mAccount == xmppConnectionService.getPendingAccount()) {
if (getActionBar() != null) {
getActionBar().setDisplayHomeAsUpEnabled(false);
getActionBar().setDisplayShowHomeEnabled(false);