1 files changed, 5 insertions, 29 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
index 787942b8d..a0b91a8c7 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
@@ -89,6 +89,7 @@ import de.pixart.messenger.ui.util.PendingItem;
 import de.pixart.messenger.utils.EmojiWrapper;
 import de.pixart.messenger.utils.ExceptionHelper;
 import de.pixart.messenger.utils.MenuDoubleTabUtil;
+import de.pixart.messenger.utils.SignupUtils;
 import de.pixart.messenger.utils.UIHelper;
 import de.pixart.messenger.utils.XmppUri;
 import de.pixart.messenger.xmpp.OnUpdateBlocklist;
@@ -235,7 +236,10 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         }
         boolean isConversationsListEmpty = xmppConnectionService.isConversationsListEmpty(ignore);
         if (isConversationsListEmpty && mRedirectInProcess.compareAndSet(false, true)) {
-            final Intent intent = getRedirectionIntent(noAnimation);
+            final Intent intent = SignupUtils.getRedirectionIntent(this);
+            if (noAnimation) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+            }
             runOnUiThread(() -> {
                 startActivity(intent);
                 overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
@@ -247,34 +251,6 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         return mRedirectInProcess.get();
     }
 
-    private Intent getRedirectionIntent(boolean noAnimation) {
-        Account pendingAccount = xmppConnectionService.getPendingAccount();
-        Intent intent;
-        if (pendingAccount != null) {
-            intent = new Intent(this, EditAccountActivity.class);
-            intent.putExtra("jid", pendingAccount.getJid().asBareJid().toString());
-        } else {
-            if (xmppConnectionService.getAccounts().size() == 0) {
-                if (Config.X509_VERIFICATION) {
-                    intent = new Intent(this, ManageAccountActivity.class);
-                } else if (Config.MAGIC_CREATE_DOMAIN != null) {
-                    intent = new Intent(this, WelcomeActivity.class);
-                    WelcomeActivity.addInviteUri(intent, getIntent());
-                } else {
-                    intent = new Intent(this, EditAccountActivity.class);
-                }
-            } else {
-                intent = new Intent(this, StartConversationActivity.class);
-            }
-        }
-        intent.putExtra("init", true);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        if (noAnimation) {
-            intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
-        }
-        return intent;
-    }
-
     private void showDialogsIfMainIsOverview() {
         if (xmppConnectionService == null) {
             return;