From 4c04210bab52af4cad9f65c205fc2e63cb9821f1 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 27 Mar 2023 22:10:42 -0500 Subject: [PATCH] Don't jump straight in, since the conversation list is safe now 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. --- .../java/eu/siacs/conversations/ui/ConversationFragment.java | 4 +--- .../eu/siacs/conversations/ui/ConversationsActivity.java | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 9933a7f3dbb6b33e44e3ea3114a87335f79e45a8..4aea64e4fbcea08a93d84f49d81e241bc67a897e 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/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; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java index 4e10f3962f6a5595411ccc80ce54d35c7c682677..0ef347cfc21fc33b36c86453015ae0d8067c3a72 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java +++ b/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);