From 1e50689658d0d2363e0fe965d99e50dd4bc66adf Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Wed, 27 Dec 2017 20:53:01 +0100
Subject: transport invitee from welcome activity to start conversations
 activity

---
 .../pixart/messenger/ui/EditAccountActivity.java   | 43 +++++++++++-----------
 1 file changed, 21 insertions(+), 22 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui/EditAccountActivity.java')

diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
index 3f9c6c48d..c461370eb 100644
--- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
@@ -328,7 +328,9 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
                 && mAccount.isOptionSet(Account.OPTION_REGISTER)
                 && xmppConnectionService.getAccounts().size() == 1) {
             xmppConnectionService.deleteAccount(mAccount);
-            startActivity(new Intent(EditAccountActivity.this, WelcomeActivity.class));
+            Intent intent = new Intent(EditAccountActivity.this, WelcomeActivity.class);
+            WelcomeActivity.addInvitee(intent, getIntent());
+            startActivity(intent);
         }
     }
 
@@ -383,30 +385,27 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
     };
 
     protected void finishInitialSetup(final Avatar avatar) {
-        runOnUiThread(new Runnable() {
-
-            @Override
-            public void run() {
-                hideKeyboard();
-                final Intent intent;
-                final XmppConnection connection = mAccount.getXmppConnection();
-                final boolean wasFirstAccount = xmppConnectionService != null && xmppConnectionService.getAccounts().size() == 1;
-                if (avatar != null || (connection != null && !connection.getFeatures().pep())) {
-                    intent = new Intent(getApplicationContext(), StartConversationActivity.class);
-                    if (wasFirstAccount) {
-                        intent.putExtra("init", true);
-                    }
-                } else {
-                    intent = new Intent(getApplicationContext(), PublishProfilePictureActivity.class);
-                    intent.putExtra(EXTRA_ACCOUNT, mAccount.getJid().toBareJid().toString());
-                    intent.putExtra("setup", true);
-                }
+        runOnUiThread(() -> {
+            hideKeyboard();
+            final Intent intent;
+            final XmppConnection connection = mAccount.getXmppConnection();
+            final boolean wasFirstAccount = xmppConnectionService != null && xmppConnectionService.getAccounts().size() == 1;
+            if (avatar != null || (connection != null && !connection.getFeatures().pep())) {
+                intent = new Intent(getApplicationContext(), StartConversationActivity.class);
                 if (wasFirstAccount) {
-                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                    intent.putExtra("init", true);
                 }
-                startActivity(intent);
-                finish();
+            } else {
+                intent = new Intent(getApplicationContext(), PublishProfilePictureActivity.class);
+                intent.putExtra(EXTRA_ACCOUNT, mAccount.getJid().toBareJid().toString());
+                intent.putExtra("setup", true);
+            }
+            if (wasFirstAccount) {
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
             }
+            WelcomeActivity.addInvitee(intent, getIntent());
+            startActivity(intent);
+            finish();
         });
     }
 
-- 
cgit v1.2.3