Don't jump straight in, since the conversation list is safe now

Stephen Paul Weber created 2 years ago

And don't switch unconditionally, since we want you to be able to start a new
flow from a link/button even if you still have the last page open from before.

Change summary

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java  | 4 
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java | 5 
2 files changed, 1 insertion(+), 8 deletions(-)

Detailed changes

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

@@ -3001,9 +3001,7 @@ public class ConversationFragment extends XmppFragment
                     if (discoJid != null) commandJid = discoJid;
                 }
                 if (node != null && commandJid != null) {
-                    if (!conversation.switchToSession(node)) {
-                        conversation.startCommand(commandFor(commandJid, node), activity.xmppConnectionService);
-                    }
+                    conversation.startCommand(commandFor(commandJid, node), activity.xmppConnectionService);
                 }
             });
             return;

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

@@ -200,11 +200,6 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
             return false;
         }
 
-        if (xmppConnectionService.isOnboarding() && xmppConnectionService.getConversations().size() < 2 && mRedirectInProcess.compareAndSet(false, true)) {
-            startCommand(xmppConnectionService.getAccounts().get(0), Jid.of("cheogram.com/CHEOGRAM%jabber:iq:register"), "jabber:iq:register");
-            return mRedirectInProcess.get();
-        }
-
         boolean isConversationsListEmpty = xmppConnectionService.isConversationsListEmpty(ignore);
         if (isConversationsListEmpty && mRedirectInProcess.compareAndSet(false, true)) {
             final Intent intent = SignupUtils.getRedirectionIntent(this);