From eff2bf429d02cf98b33e62f1a0c68503d08401e8 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Tue, 14 Jan 2025 11:24:32 -0500
Subject: [PATCH] Fix country picker reproducible builds bug.

---
 .../ChangeNumberCountryPickerFragment.java}           |  7 +++----
 .../ChangeNumberEnterPhoneNumberFragment.kt           |  5 ++---
 .../res/navigation/app_settings_change_number.xml     | 11 +----------
 app/src/main/res/navigation/registration.xml          |  6 ------
 app/src/main/res/navigation/registration_v3.xml       |  6 ------
 5 files changed, 6 insertions(+), 29 deletions(-)
 rename app/src/main/java/org/thoughtcrime/securesms/{registration/fragments/CountryPickerFragment.java => components/settings/app/changenumber/ChangeNumberCountryPickerFragment.java} (91%)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CountryPickerFragment.java b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberCountryPickerFragment.java
similarity index 91%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CountryPickerFragment.java
rename to app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberCountryPickerFragment.java
index adc00c7ac1..2bd26b37e4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/CountryPickerFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberCountryPickerFragment.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-package org.thoughtcrime.securesms.registration.fragments;
+package org.thoughtcrime.securesms.components.settings.app.changenumber;
 
 import android.os.Bundle;
 import android.text.Editable;
@@ -25,13 +25,12 @@ import androidx.loader.content.Loader;
 import androidx.navigation.fragment.NavHostFragment;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberViewModel;
 import org.thoughtcrime.securesms.database.loaders.CountryListLoader;
 
 import java.util.ArrayList;
 import java.util.Map;
 
-public final class CountryPickerFragment extends ListFragment implements LoaderManager.LoaderCallbacks<ArrayList<Map<String, String>>> {
+public final class ChangeNumberCountryPickerFragment extends ListFragment implements LoaderManager.LoaderCallbacks<ArrayList<Map<String, String>>> {
 
   public static final String KEY_COUNTRY      = "country";
   public static final String KEY_COUNTRY_CODE = "country_code";
@@ -50,7 +49,7 @@ public final class CountryPickerFragment extends ListFragment implements LoaderM
     super.onViewCreated(view, savedInstanceState);
 
     if (getArguments() != null) {
-      CountryPickerFragmentArgs arguments = CountryPickerFragmentArgs.fromBundle(requireArguments());
+      ChangeNumberCountryPickerFragmentArgs arguments = ChangeNumberCountryPickerFragmentArgs.fromBundle(requireArguments());
       resultKey = arguments.getResultKey();
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt
index 403b933c7d..0515f0da65 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterPhoneNumberFragment.kt
@@ -18,7 +18,6 @@ import org.thoughtcrime.securesms.LoggingFragment
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.ViewBinderDelegate
 import org.thoughtcrime.securesms.databinding.FragmentChangeNumberEnterPhoneNumberBinding
-import org.thoughtcrime.securesms.registration.fragments.CountryPickerFragment
 import org.thoughtcrime.securesms.registration.util.ChangeNumberInputController
 import org.thoughtcrime.securesms.util.Dialogs
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
@@ -110,11 +109,11 @@ class ChangeNumberEnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_c
     )
 
     parentFragmentManager.setFragmentResultListener(OLD_NUMBER_COUNTRY_SELECT, this) { _: String, bundle: Bundle ->
-      viewModel.setOldCountry(bundle.getInt(CountryPickerFragment.KEY_COUNTRY_CODE), bundle.getString(CountryPickerFragment.KEY_COUNTRY))
+      viewModel.setOldCountry(bundle.getInt(ChangeNumberCountryPickerFragment.KEY_COUNTRY_CODE), bundle.getString(ChangeNumberCountryPickerFragment.KEY_COUNTRY))
     }
 
     parentFragmentManager.setFragmentResultListener(NEW_NUMBER_COUNTRY_SELECT, this) { _: String, bundle: Bundle ->
-      viewModel.setNewCountry(bundle.getInt(CountryPickerFragment.KEY_COUNTRY_CODE), bundle.getString(CountryPickerFragment.KEY_COUNTRY))
+      viewModel.setNewCountry(bundle.getInt(ChangeNumberCountryPickerFragment.KEY_COUNTRY_CODE), bundle.getString(ChangeNumberCountryPickerFragment.KEY_COUNTRY))
     }
 
     viewModel.liveOldNumberState.observe(viewLifecycleOwner, oldController::updateNumber)
diff --git a/app/src/main/res/navigation/app_settings_change_number.xml b/app/src/main/res/navigation/app_settings_change_number.xml
index f0d8eaf50c..85b3761ef7 100644
--- a/app/src/main/res/navigation/app_settings_change_number.xml
+++ b/app/src/main/res/navigation/app_settings_change_number.xml
@@ -58,7 +58,7 @@
 
     <fragment
         android:id="@+id/countryPickerFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.CountryPickerFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberCountryPickerFragment"
         tools:layout="@layout/fragment_registration_country_picker">
 
         <argument
@@ -170,13 +170,4 @@
         android:name="org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberPinDiffersFragment"
         tools:layout="@layout/fragment_change_number_pin_differs" />
 
-    <action
-        android:id="@+id/action_pop_app_settings_change_number"
-        app:enterAnim="@anim/fragment_open_enter"
-        app:exitAnim="@anim/fragment_open_exit"
-        app:popEnterAnim="@anim/fragment_close_enter"
-        app:popExitAnim="@anim/fragment_close_exit"
-        app:popUpTo="@id/changePhoneNumberFragment"
-        app:popUpToInclusive="true" />
-
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/registration.xml b/app/src/main/res/navigation/registration.xml
index fc51b41f46..556ee9cb7b 100644
--- a/app/src/main/res/navigation/registration.xml
+++ b/app/src/main/res/navigation/registration.xml
@@ -119,12 +119,6 @@
 
     </fragment>
 
-    <fragment
-        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/enterCodeFragment"
         android:name="org.thoughtcrime.securesms.registration.ui.entercode.EnterCodeFragment"
diff --git a/app/src/main/res/navigation/registration_v3.xml b/app/src/main/res/navigation/registration_v3.xml
index 5a602be39c..4cd171e4bd 100644
--- a/app/src/main/res/navigation/registration_v3.xml
+++ b/app/src/main/res/navigation/registration_v3.xml
@@ -202,12 +202,6 @@
 
     </fragment>
 
-    <fragment
-        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/enterCodeFragment"
         android:name="org.thoughtcrime.securesms.registrationv3.ui.entercode.EnterCodeFragment"