From c7b83dbf8be5ddcc835c3e8d975109b5df47faeb Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 19 Feb 2020 16:27:24 +0100 Subject: [PATCH] forward to enter-profile-name after crating a burner-account --- .../thoughtcrime/securesms/WelcomeActivity.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/org/thoughtcrime/securesms/WelcomeActivity.java b/src/org/thoughtcrime/securesms/WelcomeActivity.java index ff0d95d11..c0a3a7386 100644 --- a/src/org/thoughtcrime/securesms/WelcomeActivity.java +++ b/src/org/thoughtcrime/securesms/WelcomeActivity.java @@ -165,11 +165,18 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen progressDialog.setMessage(getResources().getString(R.string.one_moment)+String.format(" %d%%", percent)); } - private void progressSuccess() { + private void progressSuccess(boolean enterDisplayname) { dcContext.endCaptureNextError(); progressDialog.dismiss(); - Intent conversationList = new Intent(getApplicationContext(), ConversationListActivity.class); - startActivity(conversationList); + + if (enterDisplayname) { + Intent intent = new Intent(getApplicationContext(), CreateProfileActivity.class); + intent.putExtra(CreateProfileActivity.FROM_WELCOME, true); + startActivity(intent); + } else { + startActivity(new Intent(getApplicationContext(), ConversationListActivity.class)); + } + finish(); } @@ -184,7 +191,7 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen progressUpdate((int)progress); } else if (progress==1000/*done*/) { - progressSuccess(); + progressSuccess(false); } } else if (manualConfigure && eventId==DcContext.DC_EVENT_CONFIGURE_PROGRESS) { @@ -202,7 +209,7 @@ public class WelcomeActivity extends BaseActionBarActivity implements DcEventCen progressUpdate((int)progress); } else if (progress==1000/*done*/) { - progressSuccess(); + progressSuccess(true); } } }