From 796e98be109624521e2b962e97fc512f3df33cee Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Thu, 18 Aug 2022 14:46:45 -0300
Subject: [PATCH] Utilize proper intent creation when launching profile creator
 from PassphraseRequiredActivity.

---
 .../securesms/PassphraseRequiredActivity.java             | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
index 38d36b75cb..8850a198a6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
@@ -238,7 +238,8 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   }
 
   private Intent getCreateProfileNameIntent() {
-    return getRoutedIntent(EditProfileActivity.class, getIntent());
+    Intent intent = EditProfileActivity.getIntentForUserProfile(this);
+    return getRoutedIntent(intent, getIntent());
   }
 
   private Intent getOldDeviceTransferIntent() {
@@ -258,6 +259,11 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
     return ChangeNumberLockActivity.createIntent(this);
   }
 
+  private Intent getRoutedIntent(Intent destination, @Nullable Intent nextIntent) {
+    if (nextIntent != null)   destination.putExtra("next_intent", nextIntent);
+    return destination;
+  }
+
   private Intent getRoutedIntent(Class<?> destination, @Nullable Intent nextIntent) {
     final Intent intent = new Intent(this, destination);
     if (nextIntent != null)   intent.putExtra("next_intent", nextIntent);