diff --git a/app/src/main/java/org/linphone/ui/main/fragment/AddParticipantsFragment.kt b/app/src/main/java/org/linphone/ui/main/fragment/AddParticipantsFragment.kt index 4de2c34f7..9df566ff9 100644 --- a/app/src/main/java/org/linphone/ui/main/fragment/AddParticipantsFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/fragment/AddParticipantsFragment.kt @@ -121,7 +121,8 @@ class AddParticipantsFragment : GenericAddressPickerFragment() { viewModel.modelsList.observe( viewLifecycleOwner ) { - if (!participants.isNullOrEmpty()) { + if (!participants.isNullOrEmpty() && viewModel.isSelectionEmpty()) { + Log.i("$TAG Found participants in arguments and selection is currently empty, adding them") viewModel.addSelectedParticipants(participants) } diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/AddParticipantsViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/AddParticipantsViewModel.kt index 275f13f7f..a78be1140 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/AddParticipantsViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/AddParticipantsViewModel.kt @@ -43,6 +43,11 @@ class AddParticipantsViewModel switchToMultipleSelectionMode() } + @UiThread + fun isSelectionEmpty(): Boolean { + return selection.value.orEmpty().isEmpty() + } + @UiThread fun addSelectedParticipants(participants: Array) { coreContext.postOnCoreThread { core ->