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

Fixed ConcurrentModificationException that could happen during contact edition

Browse source
This commit is contained in:
Sylvain Berfini 2025-09-29 13:59:50 +02:00
parent 6cb78c8c59
commit c556d14fb0
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -262,10 +262,14 @@ class ContactNewOrEditViewModel
fun addSipAddress(address: String = "", requestFieldToBeAddedInUi: Boolean = false) {
val newModel = NewOrEditNumberOrAddressModel(address, true, "", {
if (address.isEmpty()) {
addSipAddress(requestFieldToBeAddedInUi = true)
coreContext.postOnCoreThread {
addSipAddress(requestFieldToBeAddedInUi = true)
}
}
}, { model ->
removeModel(model)
coreContext.postOnCoreThread {
removeModel(model)
}
})
sipAddresses.add(newModel)
@ -282,10 +286,14 @@ class ContactNewOrEditViewModel
) {
val newModel = NewOrEditNumberOrAddressModel(number, false, label, {
if (number.isEmpty()) {
addPhoneNumber(requestFieldToBeAddedInUi = true)
coreContext.postOnCoreThread {
addPhoneNumber(requestFieldToBeAddedInUi = true)
}
}
}, { model ->
removeModel(model)
coreContext.postOnCoreThread {
removeModel(model)
}
})
phoneNumbers.add(newModel)
@ -294,14 +302,14 @@ class ContactNewOrEditViewModel
}
}
@UiThread
@WorkerThread
private fun removeModel(model: NewOrEditNumberOrAddressModel) {
if (model.isSip) {
sipAddresses.remove(model)
} else {
phoneNumbers.remove(model)
}
removeNewNumberOrAddressFieldEvent.value = Event(model)
removeNewNumberOrAddressFieldEvent.postValue(Event(model))
}
@UiThread