From 9a086ef2052c06de57ae9d4468440b31e6be45f8 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 27 Feb 2023 11:06:35 +0100 Subject: [PATCH] Fixed assistant createButton not enabled & country name not displayed if prefix auto filled --- .../assistant/viewmodels/AbstractPhoneViewModel.kt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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 d39083158..714706d1d 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 @@ -49,7 +49,7 @@ abstract class AbstractPhoneViewModel(val accountCreator: AccountCreator) : } fun isPhoneNumberOk(): Boolean { - return countryName.value.orEmpty().isNotEmpty() && phoneNumber.value.orEmpty().isNotEmpty() && phoneNumberError.value.orEmpty().isEmpty() + return prefix.value.orEmpty().isNotEmpty() && phoneNumber.value.orEmpty().isNotEmpty() && phoneNumberError.value.orEmpty().isEmpty() } fun updateFromPhoneNumberAndOrDialPlan(number: String?, dialPlan: DialPlan?) { @@ -57,6 +57,7 @@ abstract class AbstractPhoneViewModel(val accountCreator: AccountCreator) : if (dialPlan != null) { Log.i("[Assistant] Found prefix from dial plan: ${dialPlan.countryCallingCode}") prefix.value = internationalPrefix + getCountryNameFromPrefix(internationalPrefix) } if (number != null) { @@ -69,16 +70,12 @@ abstract class AbstractPhoneViewModel(val accountCreator: AccountCreator) : } } - private fun getCountryNameFromPrefix(prefix: String?): MutableLiveData { - val country = MutableLiveData() - country.value = "" - + private fun getCountryNameFromPrefix(prefix: String?) { if (prefix != null && prefix.isNotEmpty()) { val countryCode = if (prefix.first() == '+') prefix.substring(1) else prefix val dialPlan = PhoneNumberUtils.getDialPlanFromCountryCallingPrefix(countryCode) Log.i("[Assistant] Found dial plan $dialPlan from country code: $countryCode") - country.value = dialPlan?.country + countryName.value = dialPlan?.country } - return country } }