Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 18:30:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update country picker for findBy and changeNumber.

Browse Source
This commit is contained in:
Michelle Tang
2025-02-07 14:35:45 -05:00
committed by GitHub
parent 20ab362f2c
commit 850c20bcd8
11 changed files with 115 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/registration/ui/countrycode/CountryUtils.kt
View File

@@ -47,6 +47,7 @@ object CountryUtils {
}
}
@JvmStatic
fun countryToEmoji(countryCode: String): String {
return if (countryCode.isNotEmpty()) {
countryCode

10
app/src/main/java/org/thoughtcrime/securesms/registration/util/ChangeNumberInputController.java
View File

@@ -21,7 +21,10 @@ import com.google.i18n.phonenumbers.PhoneNumberUtil;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.LabeledEditText;
import org.thoughtcrime.securesms.registration.ui.countrycode.Country;
import org.thoughtcrime.securesms.registration.ui.countrycode.CountryUtils;
import org.thoughtcrime.securesms.registration.viewmodel.NumberViewState;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
/**
* Handle the logic and formatting of phone number input specifically for change number flows.
@@ -150,7 +153,7 @@ public final class ChangeNumberInputController {
private void setCountryDisplay(@Nullable String regionDisplayName) {
countrySpinnerAdapter.clear();
if (regionDisplayName == null) {
if (regionDisplayName == null || regionDisplayName.isEmpty()) {
countrySpinnerAdapter.add(context.getString(R.string.RegistrationActivity_select_your_country));
} else {
countrySpinnerAdapter.add(regionDisplayName);
@@ -245,7 +248,8 @@ public final class ChangeNumberInputController {
}
if (!isUpdating) {
callbacks.setCountry(countryCode);
Country country = new Country(CountryUtils.countryToEmoji(regionCode), PhoneNumberFormatter.getRegionDisplayName(regionCode).orElse(""), countryCode, regionCode);
callbacks.setCountry(country);
}
}
@@ -269,6 +273,6 @@ public final class ChangeNumberInputController {
void setNationalNumber(@NonNull String number);
void setCountry(int countryCode);
void setCountry(@NonNull Country country);
}
}