From 19be52737015a2bb146613a00f85c489037fee06 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Wed, 6 Sep 2017 00:29:49 -0700
Subject: [PATCH] Fix recursive experience upgrade activity problem

// FREEBIE
---
 res/layout/profile_create_activity.xml                    | 2 ++
 res/values/strings.xml                                    | 2 ++
 src/org/thoughtcrime/securesms/CreateProfileActivity.java | 8 +++-----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/res/layout/profile_create_activity.xml b/res/layout/profile_create_activity.xml
index 0f8865c658..003977269e 100644
--- a/res/layout/profile_create_activity.xml
+++ b/res/layout/profile_create_activity.xml
@@ -21,10 +21,12 @@
 
         <org.thoughtcrime.securesms.components.emoji.EmojiEditText
                 android:id="@+id/name"
+                android:hint="@string/profile_create_activity__your_name"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_weight="1"
+                android:layout_marginLeft="10dp"
                 android:inputType="textCapWords"/>
 
         <org.thoughtcrime.securesms.components.emoji.EmojiToggle
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fc5735956a..9527a9c287 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -983,6 +983,7 @@
     <string name="profile_create_activity__set_later">Set later</string>
     <string name="profile_create_activity__finish">FINISH</string>
     <string name="profile_create_activity__who_can_see_this_information">Who can see this information?</string>
+    <string name="profile_create_activity__your_name">Your name</string>
 
     <!-- recipient_preferences_activity -->
     <string name="recipient_preference_activity__blocked">BLOCKED</string>
@@ -1456,6 +1457,7 @@
     <string name="transport_selection_list_item__transport_icon">Transport icon</string>
 
 
+
     <!-- EOF -->
 
 </resources>
diff --git a/src/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
index 6d55d4ee0c..8c190fb31f 100644
--- a/src/org/thoughtcrime/securesms/CreateProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
@@ -8,7 +8,6 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -30,7 +29,6 @@ import org.thoughtcrime.securesms.components.emoji.EmojiDrawer;
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhotoFactory;
-import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
@@ -61,7 +59,7 @@ import javax.inject.Inject;
 
 import static android.provider.MediaStore.EXTRA_OUTPUT;
 
-public class CreateProfileActivity extends PassphraseRequiredActionBarActivity implements InjectableType {
+public class CreateProfileActivity extends BaseActionBarActivity implements InjectableType {
 
   private static final String TAG = CreateProfileActivity.class.getSimpleName();
 
@@ -84,8 +82,8 @@ public class CreateProfileActivity extends PassphraseRequiredActionBarActivity i
   private File   captureFile;
 
   @Override
-  public void onCreate(Bundle bundle, @NonNull MasterSecret masterSecret) {
-    super.onCreate(bundle, masterSecret);
+  public void onCreate(Bundle bundle) {
+    super.onCreate(bundle);
 
     setContentView(R.layout.profile_create_activity);