mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Keep phone number label(s) if any after editing a contact

Browse source
This commit is contained in:
Sylvain Berfini 2024-05-24 09:28:04 +02:00
parent f6e6914656
commit 481e8db0aa
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/org/linphone/ui/main/contacts/model/NewOrEditNumberOrAddressModel.kt
View file

@ -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
) {

19
app/src/main/java/org/linphone/ui/main/contacts/viewmodel/ContactNewOrEditViewModel.kt
View file

@ -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)
}