From eb4a7e613575af9f1e0af3effefea5fc4f282463 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 23 Apr 2024 10:33:59 -0500
Subject: [PATCH] If onboarding account, send them to onboarding!

Don't show them the list of contacts, they don't care about that yet.
---
 .../eu/siacs/conversations/ui/StartConversationActivity.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index edd89621bfa06bc0cbc51ca743d837ee2019e13f..4127458647f0636ce3a3c40bd0a8b16c3c167970 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/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;