From 481e8db0aa6d689c984c9f1deecfba91bc9d0125 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 24 May 2024 09:28:04 +0200
Subject: [PATCH] Keep phone number label(s) if any after editing a contact

---
 .../model/NewOrEditNumberOrAddressModel.kt    |  1 +
 .../viewmodel/ContactNewOrEditViewModel.kt    | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/linphone/ui/main/contacts/model/NewOrEditNumberOrAddressModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/model/NewOrEditNumberOrAddressModel.kt
index 2361af9cc..0861e232b 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/model/NewOrEditNumberOrAddressModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/model/NewOrEditNumberOrAddressModel.kt
@@ -26,6 +26,7 @@ import androidx.lifecycle.MutableLiveData
 class NewOrEditNumberOrAddressModel @WorkerThread constructor(
     defaultValue: String,
     val isSip: Boolean,
+    val label: String? = "",
     private val onValueNoLongerEmpty: (() -> Unit)? = null,
     private val onRemove: ((model: NewOrEditNumberOrAddressModel) -> Unit)? = null
 ) {
diff --git a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt
index 47342b2b4..447e08080 100644
--- a/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt
@@ -29,6 +29,7 @@ import kotlinx.coroutines.launch
 import org.linphone.LinphoneApplication.Companion.coreContext
 import org.linphone.R
 import org.linphone.contacts.ContactLoader.Companion.LINPHONE_ADDRESS_BOOK_FRIEND_LIST
+import org.linphone.core.Factory
 import org.linphone.core.Friend
 import org.linphone.core.FriendList.Status
 import org.linphone.core.SubscribePolicy
@@ -108,8 +109,8 @@ class ContactNewOrEditViewModel @UiThread constructor() : GenericViewModel() {
                 for (address in friend.addresses) {
                     addSipAddress(address.asStringUriOnly())
                 }
-                for (number in friend.phoneNumbers) {
-                    addPhoneNumber(number)
+                for (number in friend.phoneNumbersWithLabel) {
+                    addPhoneNumber(number.phoneNumber, number.label)
                 }
 
                 company.postValue(friend.organization)
@@ -219,8 +220,10 @@ class ContactNewOrEditViewModel @UiThread constructor() : GenericViewModel() {
             }
             for (number in phoneNumbers) {
                 val data = number.value.value.orEmpty().trim()
+                val label = number.label.orEmpty()
                 if (data.isNotEmpty()) {
-                    friend.addPhoneNumber(data)
+                    val phoneNumber = Factory.instance().createFriendPhoneNumber(data, label)
+                    friend.addPhoneNumberWithLabel(phoneNumber)
                 }
             }
 
@@ -266,7 +269,7 @@ class ContactNewOrEditViewModel @UiThread constructor() : GenericViewModel() {
 
     @WorkerThread
     fun addSipAddress(address: String = "", requestFieldToBeAddedInUi: Boolean = false) {
-        val newModel = NewOrEditNumberOrAddressModel(address, true, {
+        val newModel = NewOrEditNumberOrAddressModel(address, true, "", {
             if (address.isEmpty()) {
                 addSipAddress(requestFieldToBeAddedInUi = true)
             }
@@ -281,8 +284,12 @@ class ContactNewOrEditViewModel @UiThread constructor() : GenericViewModel() {
     }
 
     @WorkerThread
-    private fun addPhoneNumber(number: String = "", requestFieldToBeAddedInUi: Boolean = false) {
-        val newModel = NewOrEditNumberOrAddressModel(number, false, {
+    private fun addPhoneNumber(
+        number: String = "",
+        label: String? = "",
+        requestFieldToBeAddedInUi: Boolean = false
+    ) {
+        val newModel = NewOrEditNumberOrAddressModel(number, false, label, {
             if (number.isEmpty()) {
                 addPhoneNumber(requestFieldToBeAddedInUi = true)
             }