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

Also updated conversations participants selection to handle removal from add participant(s) fragment

Browse source
This commit is contained in:
Sylvain Berfini 2024-04-29 17:27:08 +02:00
parent 1719a57cdc
commit 107388584b
3 changed files with 59 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt
View file

@ -198,8 +198,7 @@ class ConversationInfoFragment : SlidingPaneChildFragment() {
sharedViewModel.listOfSelectedSipUrisEvent.observe(viewLifecycleOwner) {
it.consume { list ->
Log.i("$TAG Found [${list.size}] new participants to add to the group, let's do it")
// TODO FIXME: instead of adding them, replace current list with new one
viewModel.addParticipants(list)
viewModel.setParticipants(list)
}
}
@ -221,7 +220,10 @@ class ConversationInfoFragment : SlidingPaneChildFragment() {
Log.i("$TAG Going into participant picker fragment")
val selection = arrayListOf<String>()
for (participant in viewModel.participants.value.orEmpty()) {
selection.add(participant.address.asStringUriOnly())
if (!participant.isParticipantMyself) {
// Do not add ourselves to editable list
selection.add(participant.address.asStringUriOnly())
}
}
Log.i("$TAG [${selection.size}] participants are already selected, keeping them")
val action =

1
app/src/main/java/org/linphone/ui/main/chat/model/ParticipantModel.kt
View file

@ -30,6 +30,7 @@ class ParticipantModel @WorkerThread constructor(
val isMyselfAdmin: Boolean = false,
val isParticipantAdmin: Boolean = false,
val showMenu: Boolean = false,
val isParticipantMyself: Boolean = false,
private val onClicked: ((model: ParticipantModel) -> Unit)? = null,
private val onMenuClicked: ((view: View, model: ParticipantModel) -> Unit)? = null
) {

66
app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
View file

@ -376,7 +376,7 @@ class ConversationInfoViewModel @UiThread constructor() : AbstractConversationVi
}
@UiThread
fun addParticipants(toAdd: ArrayList<String>) {
fun setParticipants(newList: ArrayList<String>) {
coreContext.postOnCoreThread {
if (isChatRoomInitialized()) {
if (!LinphoneUtils.isChatRoomAGroup(chatRoom)) {
@ -384,26 +384,63 @@ class ConversationInfoViewModel @UiThread constructor() : AbstractConversationVi
return@postOnCoreThread
}
val list = arrayListOf<Address>()
for (participant in toAdd) {
for (participant in chatRoom.participants) {
val address = participant.address
// Do not remove ourselves if not in participants list anymore
if (LinphoneUtils.getDefaultAccount()?.params?.identityAddress?.weakEqual(
address
) == true
) {
continue
}
val uri = address.asStringUriOnly()
val found = newList.find {
it == uri
}
if (found != null) {
Log.i(
"$TAG Participant [$uri] is still in new participants list, do nothing"
)
} else {
Log.i("$TAG Removing participant [$uri] from this conversation")
chatRoom.removeParticipant(participant)
}
}
val toAddList = arrayListOf<Address>()
for (participant in newList) {
val address = Factory.instance().createAddress(participant)
if (address == null) {
Log.e("$TAG Failed to parse [$participant] as address!")
} else {
list.add(address)
val found = participants.value.orEmpty().find {
it.address.weakEqual(address)
}
if (found != null) {
Log.i(
"$TAG Participant [${address.asStringUriOnly()}] is already in group, do nothing"
)
} else {
toAddList.add(address)
}
}
}
val participantsToAdd = arrayOfNulls<Address>(list.size)
list.toArray(participantsToAdd)
Log.i("$TAG Adding [${participantsToAdd.size}] new participants to conversation")
val ok = chatRoom.addParticipants(participantsToAdd)
if (!ok) {
Log.w("$TAG Failed to add some/all participants to the group!")
val message = AppUtils.getString(
R.string.toast_failed_to_add_participant_to_group_conversation
if (toAddList.isNotEmpty()) {
val participantsToAdd = arrayOfNulls<Address>(toAddList.size)
toAddList.toArray(participantsToAdd)
Log.i(
"$TAG Adding [${participantsToAdd.size}] new participants to conversation"
)
showRedToastEvent.postValue(Event(Pair(message, R.drawable.warning_circle)))
val ok = chatRoom.addParticipants(participantsToAdd)
if (!ok) {
Log.w("$TAG Failed to add some/all participants to the group!")
val message = AppUtils.getString(
R.string.toast_failed_to_add_participant_to_group_conversation
)
showRedToastEvent.postValue(Event(Pair(message, R.drawable.warning_circle)))
}
}
}
}
@ -484,6 +521,7 @@ class ConversationInfoViewModel @UiThread constructor() : AbstractConversationVi
selfAdmin,
isParticipantAdmin = false,
showMenu = true,
isParticipantMyself = false,
onMenuClicked = { view, model ->
// openMenu
showParticipantAdminPopupMenuEvent.postValue(Event(Pair(view, model)))
@ -499,6 +537,7 @@ class ConversationInfoViewModel @UiThread constructor() : AbstractConversationVi
selfAdmin,
isParticipantAdmin = isParticipantAdmin,
showMenu = true,
isParticipantMyself = false,
onMenuClicked = { view, model ->
// openMenu
showParticipantAdminPopupMenuEvent.postValue(Event(Pair(view, model)))
@ -516,6 +555,7 @@ class ConversationInfoViewModel @UiThread constructor() : AbstractConversationVi
selfAdmin,
isParticipantAdmin = selfAdmin,
showMenu = false,
isParticipantMyself = true,
onMenuClicked = { view, model ->
// openMenu
showParticipantAdminPopupMenuEvent.postValue(Event(Pair(view, model)))