Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Prevent empty chat bubble when sending only spaces

Browse source
This commit is contained in:
Sylvain Berfini 2022-05-03 15:49:16 +02:00
parent 3eb8382423
commit a31381632f
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
View file

@ -128,7 +128,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
attachFileEnabled.value = true attachFileEnabled.value = true
sendMessageEnabled.value = false sendMessageEnabled.value = false
isReadOnly.value = chatRoom.isReadOnly() isReadOnly.value = chatRoom.isReadOnly
val recorderParams = coreContext.core.createRecorderParams() val recorderParams = coreContext.core.createRecorderParams()
if (corePreferences.voiceMessagesFormatMkv) { if (corePreferences.voiceMessagesFormatMkv) {
@ -157,7 +157,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
} }
fun onTextToSendChanged(value: String) { fun onTextToSendChanged(value: String) {
sendMessageEnabled.value = value.isNotEmpty() || attachments.value?.isNotEmpty() == true || isPendingVoiceRecord.value == true sendMessageEnabled.value = value.trim().isNotEmpty() || attachments.value?.isNotEmpty() == true || isPendingVoiceRecord.value == true
if (value.isNotEmpty()) { if (value.isNotEmpty()) {
if (attachFileEnabled.value == true && !corePreferences.allowMultipleFilesAndTextInSameMessage) { if (attachFileEnabled.value == true && !corePreferences.allowMultipleFilesAndTextInSameMessage) {
attachFileEnabled.value = false attachFileEnabled.value = false
@ -180,7 +180,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
) )
attachments.value = list attachments.value = list
sendMessageEnabled.value = textToSend.value.orEmpty().isNotEmpty() || list.isNotEmpty() || isPendingVoiceRecord.value == true sendMessageEnabled.value = textToSend.value.orEmpty().trim().isNotEmpty() || list.isNotEmpty() || isPendingVoiceRecord.value == true
if (!corePreferences.allowMultipleFilesAndTextInSameMessage) { if (!corePreferences.allowMultipleFilesAndTextInSameMessage) {
attachFileEnabled.value = false attachFileEnabled.value = false
} }
@ -192,7 +192,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
list.remove(attachment) list.remove(attachment)
attachments.value = list attachments.value = list
sendMessageEnabled.value = textToSend.value.orEmpty().isNotEmpty() || list.isNotEmpty() || isPendingVoiceRecord.value == true sendMessageEnabled.value = textToSend.value.orEmpty().trim().isNotEmpty() || list.isNotEmpty() || isPendingVoiceRecord.value == true
if (!corePreferences.allowMultipleFilesAndTextInSameMessage) { if (!corePreferences.allowMultipleFilesAndTextInSameMessage) {
attachFileEnabled.value = list.isEmpty() attachFileEnabled.value = list.isEmpty()
} }
@ -225,13 +225,13 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
isVoiceRecording.value = false isVoiceRecording.value = false
} }
val toSend = textToSend.value val toSend = textToSend.value.orEmpty().trim()
if (toSend != null && toSend.isNotEmpty()) { if (toSend.isNotEmpty()) {
if (voiceRecord && isBasicChatRoom) { if (voiceRecord && isBasicChatRoom) {
val textMessage: ChatMessage = chatRoom.createMessageFromUtf8(toSend.trim()) val textMessage: ChatMessage = chatRoom.createMessageFromUtf8(toSend)
textMessage.send() textMessage.send()
} else { } else {
message.addUtf8TextContent(toSend.trim()) message.addUtf8TextContent(toSend)
} }
} }
@ -381,7 +381,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
isPendingVoiceRecord.value = false isPendingVoiceRecord.value = false
isVoiceRecording.value = false isVoiceRecording.value = false
sendMessageEnabled.value = textToSend.value?.isNotEmpty() == true || attachments.value?.isNotEmpty() == true sendMessageEnabled.value = textToSend.value.orEmpty().trim().isNotEmpty() == true || attachments.value?.isNotEmpty() == true
if (!isPlayerClosed()) { if (!isPlayerClosed()) {
stopVoiceRecordPlayer() stopVoiceRecordPlayer()