From ef6bbbc3c87aff97030a5a03f675bc1c268fed2c Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 25 Nov 2021 10:47:58 +0100
Subject: [PATCH] Remove internation prefix from phone number in assistant, if
 possible

---
 .../assistant/viewmodels/AbstractPhoneViewModel.kt       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 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 3daca0267..bfc4c0e10 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
@@ -56,14 +56,19 @@ abstract class AbstractPhoneViewModel(val accountCreator: AccountCreator) :
     }
 
     fun updateFromPhoneNumberAndOrDialPlan(number: String?, dialPlan: DialPlan?) {
+        val internationalPrefix = "+${dialPlan?.countryCallingCode}"
         if (dialPlan != null) {
             Log.i("[Assistant] Found prefix from dial plan: ${dialPlan.countryCallingCode}")
-            prefix.value = "+${dialPlan.countryCallingCode}"
+            prefix.value = internationalPrefix
         }
 
         if (number != null) {
             Log.i("[Assistant] Found phone number: $number")
-            phoneNumber.value = number!!
+            phoneNumber.value = if (number.startsWith(internationalPrefix)) {
+                number.substring(internationalPrefix.length)
+            } else {
+                number
+            }
         }
     }