From c87e43eb92e5abd37fbf66fec4474776dab87a34 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 20 Jul 2019 15:58:05 +0200
Subject: [PATCH] put initial xmpp uri into signup intent

---
 .../java/eu/siacs/conversations/utils/SignupUtils.java         | 3 +--
 .../java/eu/siacs/conversations/ui/UriHandlerActivity.java     | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/conversations/java/eu/siacs/conversations/utils/SignupUtils.java b/src/conversations/java/eu/siacs/conversations/utils/SignupUtils.java
index 6e8ed2eff..fc5d874d3 100644
--- a/src/conversations/java/eu/siacs/conversations/utils/SignupUtils.java
+++ b/src/conversations/java/eu/siacs/conversations/utils/SignupUtils.java
@@ -20,13 +20,12 @@ public class SignupUtils {
     }
 
     public static Intent getSignUpIntent(final Activity activity, final boolean toServerChooser) {
-        Intent intent;
+        final Intent intent;
         if (toServerChooser) {
             intent = new Intent(activity, PickServerActivity.class);
         } else {
             intent = new Intent(activity, WelcomeActivity.class);
         }
-        StartConversationActivity.addInviteUri(intent, activity.getIntent());
         return intent;
     }
 
diff --git a/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java b/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java
index 95f179ceb..d1c0fa7d4 100644
--- a/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java
@@ -90,6 +90,7 @@ public class UriHandlerActivity extends AppCompatActivity {
         if (accounts.size() == 0) {
             if (xmppUri.isJidValid()) {
                 intent = SignupUtils.getSignUpIntent(this);
+                intent.putExtra(StartConversationActivity.EXTRA_INVITE_URI, xmppUri.toString());
                 startActivity(intent);
             } else {
                 Toast.makeText(this, R.string.invalid_jid, Toast.LENGTH_SHORT).show();