mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-26 22:20:20 +00:00
Registration: check if phone number is possible.
As opposed to "valid."
This commit is contained in:
committed by
mtang-signal
parent
6ac510a156
commit
ef2c67d808
@@ -153,7 +153,7 @@ class EnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_registration_
|
||||
phoneNumberInputLayout.requestFocus()
|
||||
}
|
||||
|
||||
if (fragmentViewModel.isEnteredNumberValid(fragmentState)) {
|
||||
if (fragmentViewModel.isEnteredNumberPossible(fragmentState)) {
|
||||
sharedViewModel.setPhoneNumber(fragmentViewModel.parsePhoneNumber(fragmentState))
|
||||
} else {
|
||||
sharedViewModel.setPhoneNumber(null)
|
||||
@@ -258,7 +258,7 @@ class EnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_registration_
|
||||
}
|
||||
|
||||
private fun presentRegisterButton(sharedState: RegistrationState) {
|
||||
binding.registerButton.isEnabled = sharedState.phoneNumber != null && PhoneNumberUtil.getInstance().isValidNumber(sharedState.phoneNumber)
|
||||
binding.registerButton.isEnabled = sharedState.phoneNumber != null && PhoneNumberUtil.getInstance().isPossibleNumber(sharedState.phoneNumber)
|
||||
if (sharedState.inProgress) {
|
||||
binding.registerButton.setSpinning()
|
||||
} else {
|
||||
|
||||
@@ -89,9 +89,9 @@ class EnterPhoneNumberViewModel : ViewModel() {
|
||||
return PhoneNumberUtil.getInstance().parse(state.phoneNumber, supportedCountryPrefixes[state.countryPrefixIndex].regionCode)
|
||||
}
|
||||
|
||||
fun isEnteredNumberValid(state: EnterPhoneNumberState): Boolean {
|
||||
fun isEnteredNumberPossible(state: EnterPhoneNumberState): Boolean {
|
||||
return try {
|
||||
PhoneNumberUtil.getInstance().isValidNumber(parsePhoneNumber(state))
|
||||
PhoneNumberUtil.getInstance().isPossibleNumber(parsePhoneNumber(state))
|
||||
} catch (ex: NumberParseException) {
|
||||
false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user