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 pre-selected contacts not having the checkmark in participants list edition

Browse source
This commit is contained in:
Sylvain Berfini 2024-09-18 16:28:31 +02:00
parent 0baceddf27
commit db2ce910b9
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/linphone/ui/main/fragment/AddParticipantsFragment.kt
View file

@ -81,13 +81,14 @@ class AddParticipantsFragment : GenericAddressPickerFragment() {
setupRecyclerView(binding.contactsList)
val participants = args.selectedParticipants
if (!participants.isNullOrEmpty()) {
viewModel.addSelectedParticipants(participants)
}
viewModel.modelsList.observe(
viewLifecycleOwner
) {
if (!participants.isNullOrEmpty()) {
viewModel.addSelectedParticipants(participants)
}
Log.i("$TAG Contacts & suggestions list is ready with [${it.size}] items")
adapter.submitList(it)

4
app/src/main/java/org/linphone/ui/main/viewmodel/AddParticipantsViewModel.kt
View file

@ -23,6 +23,7 @@ import androidx.annotation.UiThread
import androidx.lifecycle.MutableLiveData
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.R
import org.linphone.core.Address
import org.linphone.core.tools.Log
import org.linphone.ui.main.model.SelectedAddressModel
import org.linphone.utils.AppUtils
@ -45,6 +46,7 @@ class AddParticipantsViewModel @UiThread constructor() : AddressSelectionViewMod
coreContext.postOnCoreThread { core ->
Log.i("$TAG Adding [${participants.size}] pre-selected participants")
val list = arrayListOf<SelectedAddressModel>()
val addresses = arrayListOf<Address>()
for (uri in participants) {
val address = core.interpretUrl(uri, false)
@ -52,6 +54,7 @@ class AddParticipantsViewModel @UiThread constructor() : AddressSelectionViewMod
Log.e("$TAG Failed to parse participant URI [$uri] as address!")
continue
}
addresses.add(address)
val avatarModel = coreContext.contactsManager.getContactAvatarModelForAddress(
address
@ -70,6 +73,7 @@ class AddParticipantsViewModel @UiThread constructor() : AddressSelectionViewMod
)
)
selection.postValue(list)
updateSelectedParticipants(addresses)
}
}

11
app/src/main/java/org/linphone/ui/main/viewmodel/AddressSelectionViewModel.kt
View file

@ -28,6 +28,7 @@ import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.R
import org.linphone.contacts.ContactsManager
import org.linphone.core.Address
import org.linphone.core.ChatRoom
import org.linphone.core.Friend
import org.linphone.core.MagicSearch
@ -135,6 +136,16 @@ abstract class AddressSelectionViewModel @UiThread constructor() : DefaultAccoun
)
}
@WorkerThread
fun updateSelectedParticipants(selectedAddresses: List<Address>) {
for (address in selectedAddresses) {
val found = modelsList.value.orEmpty().find {
it.address.weakEqual(address)
}
found?.selected?.postValue(true)
}
}
@WorkerThread
fun addAddressModelToSelection(model: SelectedAddressModel) {
val actual = selection.value.orEmpty()