Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update country name when prefix is manually changed

Browse source
This commit is contained in:
Sylvain Berfini 2023-07-17 17:31:58 +02:00
parent d623b597b5
commit 0ee446ffce
4 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt
View file

@ -75,6 +75,10 @@ class AccountLoginFragment : AbstractPhoneFragment<AssistantAccountLoginFragment
startActivity(intent) startActivity(intent)
} }
viewModel.prefix.observe(viewLifecycleOwner) { internationalPrefix ->
viewModel.getCountryNameFromPrefix(internationalPrefix)
}
viewModel.goToSmsValidationEvent.observe( viewModel.goToSmsValidationEvent.observe(
viewLifecycleOwner viewLifecycleOwner
) { ) {

4
app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt
View file

@ -62,6 +62,10 @@ class PhoneAccountCreationFragment :
countryPickerFragment.show(childFragmentManager, "CountryPicker") countryPickerFragment.show(childFragmentManager, "CountryPicker")
} }
viewModel.prefix.observe(viewLifecycleOwner) { internationalPrefix ->
viewModel.getCountryNameFromPrefix(internationalPrefix)
}
viewModel.goToSmsValidationEvent.observe( viewModel.goToSmsValidationEvent.observe(
viewLifecycleOwner viewLifecycleOwner
) { ) {

4
app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt
View file

@ -73,6 +73,10 @@ class PhoneAccountLinkingFragment : AbstractPhoneFragment<AssistantPhoneAccountL
countryPickerFragment.show(childFragmentManager, "CountryPicker") countryPickerFragment.show(childFragmentManager, "CountryPicker")
} }
viewModel.prefix.observe(viewLifecycleOwner) { internationalPrefix ->
viewModel.getCountryNameFromPrefix(internationalPrefix)
}
viewModel.goToSmsValidationEvent.observe( viewModel.goToSmsValidationEvent.observe(
viewLifecycleOwner viewLifecycleOwner
) { ) {

2
app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt
View file

@ -69,7 +69,7 @@ abstract class AbstractPhoneViewModel(accountCreator: AccountCreator) :
} }
} }
private fun getCountryNameFromPrefix(prefix: String?) { fun getCountryNameFromPrefix(prefix: String?) {
if (!prefix.isNullOrEmpty()) { if (!prefix.isNullOrEmpty()) {
val countryCode = if (prefix.first() == '+') prefix.substring(1) else prefix val countryCode = if (prefix.first() == '+') prefix.substring(1) else prefix
val dialPlan = PhoneNumberUtils.getDialPlanFromCountryCallingPrefix(countryCode) val dialPlan = PhoneNumberUtils.getDialPlanFromCountryCallingPrefix(countryCode)