From 85a5e058fb75c0d8023be30136f2294139689eb6 Mon Sep 17 00:00:00 2001 From: Michelle Tang Date: Mon, 10 Feb 2025 08:48:26 -0500 Subject: [PATCH] Fix default country code. --- .../registration/ui/phonenumber/EnterPhoneNumberViewModel.kt | 3 +++ .../registrationv3/ui/phonenumber/EnterPhoneNumberViewModel.kt | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberViewModel.kt index c5885950af..a9ba4e4ad9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberViewModel.kt @@ -67,9 +67,12 @@ class EnterPhoneNumberViewModel : ViewModel() { } val countryCode = PhoneNumberUtil.getInstance().getCountryCodeForRegion(regionCode) + val prefixIndex = countryCodeToAdapterIndex(countryCode) store.update { it.copy( + countryPrefixIndex = prefixIndex, + phoneNumberRegionCode = regionCode, country = existingCountry ?: Country( name = PhoneNumberFormatter.getRegionDisplayName(regionCode).orElse(""), emoji = CountryUtils.countryToEmoji(regionCode), diff --git a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberViewModel.kt index 9031931255..b0ac68ce2a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registrationv3/ui/phonenumber/EnterPhoneNumberViewModel.kt @@ -67,9 +67,12 @@ class EnterPhoneNumberViewModel : ViewModel() { } val countryCode = PhoneNumberUtil.getInstance().getCountryCodeForRegion(regionCode) + val prefixIndex = countryCodeToAdapterIndex(countryCode) store.update { it.copy( + countryPrefixIndex = prefixIndex, + phoneNumberRegionCode = regionCode, country = existingCountry ?: Country( name = PhoneNumberFormatter.getRegionDisplayName(regionCode).orElse(""), emoji = CountryUtils.countryToEmoji(regionCode),