From cecfe80d61f01d6afe3fc5d0e70adc5abb23de6b Mon Sep 17 00:00:00 2001
From: Nicholas Tinsley <nicholas@signal.org>
Date: Tue, 9 Jul 2024 16:13:22 -0400
Subject: [PATCH] Simplify reg v2 nav graph names.

---
 .../phonenumber/EnterPhoneNumberFragment.kt   |  2 +-
 .../ReRegisterWithPinFragment.kt              |  4 +-
 .../ui/welcome/WelcomeFragment.kt             |  4 +-
 app/src/main/res/navigation/registration.xml  | 74 +++++++++----------
 app/src/main/res/navigation/restore.xml       |  2 +-
 5 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt
index 97487e1c59..c183469921 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt
@@ -516,7 +516,7 @@ class EnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_registration_
   }
 
   private fun moveToEnterPinScreen() {
-    findNavController().safeNavigate(EnterPhoneNumberFragmentDirections.actionReRegisterWithPinV2Fragment())
+    findNavController().safeNavigate(EnterPhoneNumberFragmentDirections.actionReRegisterWithPinFragment())
     sharedViewModel.setInProgress(false)
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinFragment.kt
index 57e33ef070..71a85ff660 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/reregisterwithpin/ReRegisterWithPinFragment.kt
@@ -83,7 +83,7 @@ class ReRegisterWithPinFragment : LoggingFragment(R.layout.fragment_registration
     if (state.networkError != null) {
       genericErrorDialog()
     } else if (!state.canSkipSms) {
-      findNavController().safeNavigate(ReRegisterWithPinFragmentDirections.actionReRegisterWithPinFragmentToEnterPhoneNumberV2Fragment())
+      findNavController().safeNavigate(ReRegisterWithPinFragmentDirections.actionReRegisterWithPinFragmentToEnterPhoneNumberFragment())
     } else if (state.isRegistrationLockEnabled && state.svrTriesRemaining == 0) {
       Log.w(TAG, "Unable to continue skip flow, KBS is locked")
       onAccountLocked()
@@ -263,7 +263,7 @@ class ReRegisterWithPinFragment : LoggingFragment(R.layout.fragment_registration
 
       is RegisterAccountResult.IncorrectRecoveryPassword -> {
         registrationViewModel.setUserSkippedReRegisterFlow(true)
-        findNavController().safeNavigate(ReRegisterWithPinFragmentDirections.actionReRegisterWithPinFragmentToEnterPhoneNumberV2Fragment())
+        findNavController().safeNavigate(ReRegisterWithPinFragmentDirections.actionReRegisterWithPinFragmentToEnterPhoneNumberFragment())
       }
 
       is RegisterAccountResult.AttemptsExhausted,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeFragment.kt
index bd421f357f..8f534bac4f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/welcome/WelcomeFragment.kt
@@ -67,7 +67,7 @@ class WelcomeFragment : LoggingFragment(R.layout.fragment_registration_welcome)
   private fun onContinueClicked() {
     TextSecurePreferences.setHasSeenWelcomeScreen(requireContext(), true)
     if (Permissions.isRuntimePermissionsRequired() && !hasAllPermissions()) {
-      findNavController().safeNavigate(WelcomeFragmentDirections.actionWelcomeFragmentToGrantPermissionsV2Fragment(GrantPermissionsFragment.WelcomeAction.CONTINUE))
+      findNavController().safeNavigate(WelcomeFragmentDirections.actionWelcomeFragmentToGrantPermissionsFragment(GrantPermissionsFragment.WelcomeAction.CONTINUE))
     } else {
       sharedViewModel.maybePrefillE164(requireContext())
       findNavController().safeNavigate(WelcomeFragmentDirections.actionSkipRestore())
@@ -85,7 +85,7 @@ class WelcomeFragment : LoggingFragment(R.layout.fragment_registration_welcome)
 
   private fun onTransferOrRestoreClicked() {
     if (Permissions.isRuntimePermissionsRequired() && !hasAllPermissions()) {
-      findNavController().safeNavigate(WelcomeFragmentDirections.actionWelcomeFragmentToGrantPermissionsV2Fragment(GrantPermissionsFragment.WelcomeAction.RESTORE_BACKUP))
+      findNavController().safeNavigate(WelcomeFragmentDirections.actionWelcomeFragmentToGrantPermissionsFragment(GrantPermissionsFragment.WelcomeAction.RESTORE_BACKUP))
     } else {
       sharedViewModel.setRegistrationCheckpoint(RegistrationCheckpoint.PERMISSIONS_GRANTED)
 
diff --git a/app/src/main/res/navigation/registration.xml b/app/src/main/res/navigation/registration.xml
index c193e842e4..02d23b8edb 100644
--- a/app/src/main/res/navigation/registration.xml
+++ b/app/src/main/res/navigation/registration.xml
@@ -2,18 +2,18 @@
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/signup_v2"
-    app:startDestination="@id/welcomeV2Fragment">
+    android:id="@+id/signup"
+    app:startDestination="@id/welcomeFragment">
 
     <fragment
-        android:id="@+id/welcomeV2Fragment"
+        android:id="@+id/welcomeFragment"
         android:name="org.thoughtcrime.securesms.registration.ui.welcome.WelcomeFragment"
         android:label="fragment_welcome"
         tools:layout="@layout/fragment_registration_welcome">
 
         <action
             android:id="@+id/action_skip_restore"
-            app:destination="@id/enterPhoneNumberV2Fragment"
+            app:destination="@id/enterPhoneNumberFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
@@ -21,15 +21,15 @@
 
         <action
             android:id="@+id/action_go_to_registration"
-            app:destination="@id/enterPhoneNumberV2Fragment"
+            app:destination="@id/enterPhoneNumberFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
             app:popExitAnim="@anim/nav_default_pop_exit_anim" />
 
         <action
-            android:id="@+id/action_welcomeFragment_to_grantPermissionsV2Fragment"
-            app:destination="@id/grantPermissionsV2Fragment"
+            android:id="@+id/action_welcomeFragment_to_grantPermissionsFragment"
+            app:destination="@id/grantPermissionsFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
@@ -38,14 +38,14 @@
     </fragment>
 
     <fragment
-        android:id="@+id/grantPermissionsV2Fragment"
+        android:id="@+id/grantPermissionsFragment"
         android:name="org.thoughtcrime.securesms.registration.ui.grantpermissions.GrantPermissionsFragment"
         android:label="fragment_grant_permissions">
 
         <action
             android:id="@+id/action_enter_phone_number"
-            app:destination="@id/enterPhoneNumberV2Fragment"
-            app:popUpTo="@+id/welcomeV2Fragment"
+            app:destination="@id/enterPhoneNumberFragment"
+            app:popUpTo="@+id/welcomeFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
@@ -58,14 +58,14 @@
     </fragment>
 
     <fragment
-        android:id="@+id/enterPhoneNumberV2Fragment"
+        android:id="@+id/enterPhoneNumberFragment"
         android:name="org.thoughtcrime.securesms.registration.ui.phonenumber.EnterPhoneNumberFragment"
         android:label="fragment_enter_phone_number"
         tools:layout="@layout/fragment_registration_enter_phone_number">
 
          <action
             android:id="@+id/action_enterVerificationCode"
-            app:destination="@id/enterCodeV2Fragment"
+            app:destination="@id/enterCodeFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
@@ -73,7 +73,7 @@
 
         <action
             android:id="@+id/action_requestCaptcha"
-            app:destination="@id/captchaV2Fragment"
+            app:destination="@id/captchaFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
@@ -81,49 +81,49 @@
 
         <action
             android:id="@+id/action_editProxy"
-            app:destination="@+id/registrationProxyV2Fragment"
+            app:destination="@+id/registrationProxyFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
             app:popExitAnim="@anim/nav_default_pop_exit_anim" />
 
         <action
-            android:id="@+id/action_reRegisterWithPinV2Fragment"
-            app:destination="@id/reRegisterWithPinV2Fragment"
+            android:id="@+id/action_reRegisterWithPinFragment"
+            app:destination="@id/reRegisterWithPinFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
             app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@id/enterPhoneNumberV2Fragment"
+            app:popUpTo="@id/enterPhoneNumberFragment"
             app:popUpToInclusive="true" />
 
     </fragment>
 
     <fragment
-        android:id="@+id/countryPickerV2Fragment"
+        android:id="@+id/countryPickerFragment"
         android:name="org.thoughtcrime.securesms.registration.fragments.CountryPickerFragment"
         android:label="fragment_country_picker"
         tools:layout="@layout/fragment_registration_country_picker" />
 
     <fragment
-        android:id="@+id/enterCodeV2Fragment"
+        android:id="@+id/enterCodeFragment"
         android:name="org.thoughtcrime.securesms.registration.ui.entercode.EnterCodeFragment"
         android:label="fragment_enter_code"
         tools:layout="@layout/fragment_registration_enter_code">
 
         <action
             android:id="@+id/action_requireKbsLockPin"
-            app:destination="@id/registrationLockV2Fragment"
+            app:destination="@id/registrationLockFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
             app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@+id/welcomeV2Fragment"
+            app:popUpTo="@+id/welcomeFragment"
             app:popUpToInclusive="true" />
 
         <action
             android:id="@+id/action_requestCaptcha"
-            app:destination="@id/captchaV2Fragment"
+            app:destination="@id/captchaFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
@@ -131,30 +131,30 @@
 
         <action
             android:id="@+id/action_accountLocked"
-            app:destination="@id/accountLockedV2Fragment"
+            app:destination="@id/accountLockedFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
             app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@+id/welcomeV2Fragment"
+            app:popUpTo="@+id/welcomeFragment"
             app:popUpToInclusive="true" />
 
     </fragment>
 
     <fragment
-        android:id="@+id/registrationLockV2Fragment"
+        android:id="@+id/registrationLockFragment"
         android:name="org.thoughtcrime.securesms.registration.ui.registrationlock.RegistrationLockFragment"
         android:label="fragment_kbs_lock"
         tools:layout="@layout/fragment_registration_lock">
 
         <action
             android:id="@+id/action_accountLocked"
-            app:destination="@id/accountLockedV2Fragment"
+            app:destination="@id/accountLockedFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
             app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@+id/welcomeV2Fragment"
+            app:popUpTo="@+id/welcomeFragment"
             app:popUpToInclusive="true" />
 
         <argument
@@ -164,49 +164,49 @@
     </fragment>
 
     <fragment
-        android:id="@+id/reRegisterWithPinV2Fragment"
+        android:id="@+id/reRegisterWithPinFragment"
         android:name="org.thoughtcrime.securesms.registration.ui.reregisterwithpin.ReRegisterWithPinFragment"
         tools:layout="@layout/fragment_registration_lock">
 
         <action
-            android:id="@+id/action_reRegisterWithPinFragment_to_enterPhoneNumberV2Fragment"
-            app:destination="@id/enterPhoneNumberV2Fragment"
+            android:id="@+id/action_reRegisterWithPinFragment_to_enterPhoneNumberFragment"
+            app:destination="@id/enterPhoneNumberFragment"
             app:enterAnim="@anim/nav_default_enter_anim"
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
             app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@+id/reRegisterWithPinV2Fragment"
+            app:popUpTo="@+id/reRegisterWithPinFragment"
             app:popUpToInclusive="true" />
 
     </fragment>
 
     <fragment
-        android:id="@+id/accountLockedV2Fragment"
+        android:id="@+id/accountLockedFragment"
         android:name="org.thoughtcrime.securesms.registration.ui.accountlocked.AccountLockedFragment"
         android:label="fragment_account_locked"
         tools:layout="@layout/account_locked_fragment" />
 
     <fragment
-        android:id="@+id/captchaV2Fragment"
+        android:id="@+id/captchaFragment"
         android:name="org.thoughtcrime.securesms.registration.ui.captcha.RegistrationCaptchaFragment"
         android:label="fragment_captcha"
         tools:layout="@layout/fragment_registration_captcha" />
 
 
     <fragment
-        android:id="@+id/registrationProxyV2Fragment"
+        android:id="@+id/registrationProxyFragment"
         android:name="org.thoughtcrime.securesms.preferences.EditProxyFragment"
         android:label="fragment_registration_edit_proxy"
         tools:layout="@layout/edit_proxy_fragment" />
 
     <action
-        android:id="@+id/action_restart_to_welcomeV2Fragment"
-        app:destination="@id/welcomeV2Fragment"
+        android:id="@+id/action_restart_to_welcomeFragment"
+        app:destination="@id/welcomeFragment"
         app:enterAnim="@anim/nav_default_enter_anim"
         app:exitAnim="@anim/nav_default_exit_anim"
         app:popEnterAnim="@anim/nav_default_pop_enter_anim"
         app:popExitAnim="@anim/nav_default_pop_exit_anim"
-        app:popUpTo="@id/welcomeV2Fragment"
+        app:popUpTo="@id/welcomeFragment"
         app:popUpToInclusive="true" />
 
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/restore.xml b/app/src/main/res/navigation/restore.xml
index a9870015e0..a9601fe206 100644
--- a/app/src/main/res/navigation/restore.xml
+++ b/app/src/main/res/navigation/restore.xml
@@ -153,7 +153,7 @@
             app:exitAnim="@anim/nav_default_exit_anim"
             app:popEnterAnim="@anim/nav_default_pop_enter_anim"
             app:popExitAnim="@anim/nav_default_pop_exit_anim"
-            app:popUpTo="@id/welcomeV2Fragment" />
+            app:popUpTo="@id/welcomeFragment" />
 
     </fragment>