aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-12-27 20:53:01 +0100
committerChristian Schneppe <christian@pix-art.de>2017-12-27 20:53:01 +0100
commit1e50689658d0d2363e0fe965d99e50dd4bc66adf (patch)
treec35bfefb9299104484fa776f886d5c8a3d602a7c /src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java
parent1056adb285a367b7485e447e1a673a0885e9167e (diff)
transport invitee from welcome activity to start conversations activity
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java')
-rw-r--r--src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java8
1 files changed, 4 insertions, 4 deletions
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);