From 1e50689658d0d2363e0fe965d99e50dd4bc66adf Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 27 Dec 2017 20:53:01 +0100 Subject: transport invitee from welcome activity to start conversations activity --- .../de/pixart/messenger/ui/PublishProfilePictureActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java') diff --git a/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java b/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java index 415e5a5df..8ac690ea9 100644 --- a/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java +++ b/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java @@ -62,8 +62,8 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC public void success(Avatar object) { runOnUiThread(() -> { if (mInitialAccountSetup) { - Intent intent = new Intent(getApplicationContext(), - StartConversationActivity.class); + Intent intent = new Intent(getApplicationContext(), StartConversationActivity.class); + WelcomeActivity.addInvitee(intent, getIntent()); intent.putExtra("init", true); startActivity(intent); } @@ -109,9 +109,9 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC }); this.cancelButton.setOnClickListener(v -> { if (mInitialAccountSetup) { - Intent intent = new Intent(getApplicationContext(), - StartConversationActivity.class); + Intent intent = new Intent(getApplicationContext(), StartConversationActivity.class); if (xmppConnectionService != null && xmppConnectionService.getAccounts().size() == 1) { + WelcomeActivity.addInvitee(intent, getIntent()); intent.putExtra("init", true); } startActivity(intent); -- cgit v1.2.3