diff options
| author | Christian S <christian@pix-art.de> | 2016-04-21 20:12:14 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-21 20:12:14 +0200 |
| commit | f7c700880a537064ab88001431b6040909920b44 (patch) | |
| tree | fcc0d16bd71a18ba959284ab31a4d345b5383d3e /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | |
| parent | 9e15ac10ccc4d021c10eeaed8988fa14ea73e3dc (diff) | |
| parent | 1a073ca45455dcf46bb4d8bcaa962030a65c435a (diff) | |
Merge branch 'refs/heads/siacs/master' into welcome-screen
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationActivity.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index ea3cf627a..a7f0f8d72 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -1222,6 +1222,8 @@ public class ConversationActivity extends XmppActivity if (mRedirected.compareAndSet(false, true)) { if (Config.X509_VERIFICATION) { startActivity(new Intent(this, ManageAccountActivity.class)); + } else if (Config.MAGIC_CREATE_DOMAIN != null) { + startActivity(new Intent(this, WelcomeActivity.class)); } else { startActivity(new Intent(this, EditAccountActivity.class)); } @@ -1229,9 +1231,14 @@ public class ConversationActivity extends XmppActivity } } else if (conversationList.size() <= 0) { if (mRedirected.compareAndSet(false, true)) { - Intent intent = new Intent(this, StartConversationActivity.class); - intent.putExtra("init", true); - startActivity(intent); + Account pendingAccount = xmppConnectionService.getPendingAccount(); + if (pendingAccount == null) { + Intent intent = new Intent(this, StartConversationActivity.class); + intent.putExtra("init", true); + startActivity(intent); + } else { + switchToAccount(pendingAccount, true); + } finish(); } } else if (getIntent() != null && VIEW_CONVERSATION.equals(getIntent().getType())) { |