From cbd7160e2399d84446dcdf60525186338228e0d3 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 7 Feb 2020 00:47:52 -0500
Subject: [PATCH] Show profile creation before PIN creation.

---
 .../PassphraseRequiredActionBarActivity.java       |  4 ++--
 .../securesms/lock/v2/ConfirmKbsPinFragment.java   |  2 ++
 .../thoughtcrime/securesms/lock/v2/PinUtil.java    |  5 +++++
 .../profiles/edit/EditProfileFragment.java         |  5 ++++-
 .../fragments/RegistrationCompleteFragment.java    | 14 +++++++-------
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
index f95e1ddf52..4603c9e86f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
@@ -175,10 +175,10 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
       return STATE_WELCOME_PUSH_SCREEN;
     } else if (ExperienceUpgradeActivity.isUpdate(this)) {
       return STATE_EXPERIENCE_UPGRADE;
-    } else if (userMustSetKbsPin()) {
-      return STATE_CREATE_KBS_PIN;
     } else if (userMustSetProfileName()) {
       return STATE_CREATE_PROFILE_NAME;
+    } else if (userMustSetKbsPin()) {
+      return STATE_CREATE_KBS_PIN;
     } else {
       return STATE_NORMAL;
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java
index 2cf8fcc5b3..d47a429119 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java
@@ -19,6 +19,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 import org.thoughtcrime.securesms.animation.AnimationRepeatListener;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.megaphone.Megaphones;
 import org.thoughtcrime.securesms.util.SpanUtil;
 
@@ -106,6 +107,7 @@ public class ConfirmKbsPinFragment extends BaseKbsPinFragment<ConfirmKbsPinViewM
           public void onAnimationEnd(Animator animation) {
             requireActivity().setResult(Activity.RESULT_OK);
             closeNavGraphBranch();
+            SignalStore.registrationValues().setRegistrationComplete();
           }
         });
         break;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/PinUtil.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/PinUtil.java
index ddb2efee71..31ec74cfff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/PinUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/PinUtil.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.util.CensorshipUtil;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
@@ -15,4 +16,8 @@ public final class PinUtil {
   public static boolean userHasPin(@NonNull Context context) {
     return TextSecurePreferences.isV1RegistrationLockEnabled(context) || SignalStore.kbsValues().isV2RegistrationLockEnabled();
   }
+
+  public static boolean shouldShowPinCreationDuringRegistration(@NonNull Context context) {
+    return FeatureFlags.pinsForAll() && !PinUtil.userHasPin(context) && !CensorshipUtil.isCensored(context);
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java
index a1e2c09929..8067527d67 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java
@@ -36,6 +36,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.avatar.AvatarSelection;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.lock.v2.PinUtil;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.permissions.Permissions;
@@ -323,7 +324,9 @@ public class EditProfileFragment extends Fragment {
           }
         }
 
-        SignalStore.registrationValues().setRegistrationComplete();
+        if (!PinUtil.shouldShowPinCreationDuringRegistration(requireContext())) {
+          SignalStore.registrationValues().setRegistrationComplete();
+        }
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) handleFinishedLollipop();
         else                                                       handleFinishedLegacy();
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.java
index 50c2c033ba..e56c4f45fa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationCompleteFragment.java
@@ -36,16 +36,16 @@ public final class RegistrationCompleteFragment extends BaseRegistrationFragment
 
 
     if (!isReregister()) {
-      final Intent main = new Intent(activity, MainActivity.class);
-      final Intent next = chainIntents(new Intent(activity, EditProfileActivity.class), main);
+      final Intent main    = new Intent(activity, MainActivity.class);
+      final Intent profile = new Intent(activity, EditProfileActivity.class);
 
-      next.putExtra(EditProfileActivity.SHOW_TOOLBAR, false);
+      profile.putExtra(EditProfileActivity.SHOW_TOOLBAR, false);
 
-      Context context = requireContext();
-      if (FeatureFlags.pinsForAll() && !PinUtil.userHasPin(context) && !CensorshipUtil.isCensored(requireContext())) {
-        activity.startActivity(chainIntents(CreateKbsPinActivity.getIntentForPinCreate(context), next));
+      if (PinUtil.shouldShowPinCreationDuringRegistration(requireContext())) {
+        Intent kbs = CreateKbsPinActivity.getIntentForPinCreate(requireContext());
+        activity.startActivity(chainIntents(chainIntents(profile, kbs), main));
       } else {
-        activity.startActivity(next);
+        activity.startActivity(chainIntents(profile, main));
       }
     }