diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt index abee404c6..e9a35b94b 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt @@ -75,6 +75,10 @@ class AccountLoginFragment : AbstractPhoneFragment + viewModel.getCountryNameFromPrefix(internationalPrefix) + } + viewModel.goToSmsValidationEvent.observe( viewLifecycleOwner ) { diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt index 005a8d8d1..4f285e8b5 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt @@ -62,6 +62,10 @@ class PhoneAccountCreationFragment : countryPickerFragment.show(childFragmentManager, "CountryPicker") } + viewModel.prefix.observe(viewLifecycleOwner) { internationalPrefix -> + viewModel.getCountryNameFromPrefix(internationalPrefix) + } + viewModel.goToSmsValidationEvent.observe( viewLifecycleOwner ) { diff --git a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt index c543ebc94..d8fd87e22 100644 --- a/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt +++ b/app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt @@ -73,6 +73,10 @@ class PhoneAccountLinkingFragment : AbstractPhoneFragment + viewModel.getCountryNameFromPrefix(internationalPrefix) + } + viewModel.goToSmsValidationEvent.observe( viewLifecycleOwner ) { diff --git a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt index f17515b04..aabbc44c9 100644 --- a/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt +++ b/app/src/main/java/org/linphone/activities/assistant/viewmodels/AbstractPhoneViewModel.kt @@ -69,7 +69,7 @@ abstract class AbstractPhoneViewModel(accountCreator: AccountCreator) : } } - private fun getCountryNameFromPrefix(prefix: String?) { + fun getCountryNameFromPrefix(prefix: String?) { if (!prefix.isNullOrEmpty()) { val countryCode = if (prefix.first() == '+') prefix.substring(1) else prefix val dialPlan = PhoneNumberUtils.getDialPlanFromCountryCallingPrefix(countryCode)