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

Prevent sending multipart SIP message in basic chat rooms

Browse source
This commit is contained in:
Sylvain Berfini 2025-02-10 10:55:18 +01:00
parent 22b447a67f
commit ba5786fa0a
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/org/linphone/ui/main/chat/viewmodel/SendMessageInConversationViewModel.kt
View file

@ -248,6 +248,8 @@ class SendMessageInConversationViewModel
@UiThread
fun sendMessage() {
coreContext.postOnCoreThread {
val isBasicChatRoom: Boolean = chatRoom.hasCapability(ChatRoom.Capabilities.Basic.toInt())
val messageToReplyTo = chatMessageToReplyTo
val message = if (messageToReplyTo != null) {
Log.i("$TAG Sending message as reply to [${messageToReplyTo.messageId}]")
@ -255,10 +257,12 @@ class SendMessageInConversationViewModel
} else {
chatRoom.createEmptyMessage()
}
var contentAdded = false
val toSend = textToSend.value.orEmpty().trim()
if (toSend.isNotEmpty()) {
message.addUtf8TextContent(toSend)
contentAdded = true
}
if (isVoiceRecording.value == true && voiceMessageRecorder.file != null) {
@ -268,7 +272,14 @@ class SendMessageInConversationViewModel
Log.i(
"$TAG Voice recording content created, file name is ${content.name} and duration is ${content.fileDuration}"
)
message.addContent(content)
if (isBasicChatRoom && contentAdded) {
val voiceMessage = chatRoom.createEmptyMessage()
voiceMessage.addContent(content)
voiceMessage.send()
} else {
message.addContent(content)
contentAdded = true
}
} else {
Log.e("$TAG Voice recording content couldn't be created!")
}
@ -293,7 +304,14 @@ class SendMessageInConversationViewModel
// Let the file body handler take care of the upload
content.filePath = attachment.path
message.addFileContent(content)
if (isBasicChatRoom && contentAdded) {
val fileMessage = chatRoom.createEmptyMessage()
fileMessage.addFileContent(content)
fileMessage.send()
} else {
message.addFileContent(content)
contentAdded = true
}
}
}