If onboarding account, send them to onboarding!

Stephen Paul Weber created 2 years ago

Don't show them the list of contacts, they don't care about that yet.

Change summary

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

Detailed changes

src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java

@@ -1002,9 +1002,9 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
         final boolean onboardingCancel = xmppConnectionService.getPreferences().getString("onboarding_action", "").equals("cancel");
         if (onboardingCancel) xmppConnectionService.getPreferences().edit().remove("onboarding_action").commit();
 
-        if (intent != null && intent.getBooleanExtra("init", false) && !onboardingCancel && !xmppConnectionService.getAccounts().isEmpty()) {
+        if ((xmppConnectionService.isOnboarding() || (intent != null && intent.getBooleanExtra("init", false))) && !onboardingCancel && !xmppConnectionService.getAccounts().isEmpty()) {
             Account selectedAccount = xmppConnectionService.getAccounts().get(0);
-            final String accountJid = intent.getStringExtra(EXTRA_ACCOUNT);
+            final String accountJid = intent == null ? null : intent.getStringExtra(EXTRA_ACCOUNT);
             intent = null;
             boolean hasPstnOrSms = false;
             Account onboardingAccount = null;