From 1488a33e9a9f227ba906e4e0454128f5e7b66e76 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Wed, 25 Jun 2025 16:03:20 +0200 Subject: [PATCH] check if message is null Signed-off-by: sowjanyakch --- .../talk/chat/MessageInputFragment.kt | 97 ++++++++++--------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt index bdcfbe531..8059f2b85 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt @@ -925,57 +925,58 @@ class MessageInputFragment : Fragment() { } private fun setEditUI(message: ChatMessage) { - val editedMessage = ChatUtils.getParsedMessage(message.message, message.messageParameters) - binding.fragmentEditView.editMessage.text = editedMessage - binding.fragmentMessageInputView.inputEditText.setText(editedMessage) - val end = binding.fragmentMessageInputView.inputEditText.text.length - binding.fragmentMessageInputView.inputEditText.setSelection(end) - binding.fragmentMessageInputView.messageSendButton.visibility = View.GONE - binding.fragmentMessageInputView.recordAudioButton.visibility = View.GONE - binding.fragmentMessageInputView.editMessageButton.visibility = View.VISIBLE - binding.fragmentEditView.editMessageView.visibility = View.VISIBLE - binding.fragmentMessageInputView.attachmentButton.visibility = View.GONE - binding.fragmentMessageInputView.editMessageButton.setOnClickListener { - val inputEditText = binding.fragmentMessageInputView.inputEditText!!.editableText - - val mentionSpans = inputEditText.getSpans( - 0, - inputEditText.length, - Spans.MentionChipSpan::class.java - ) - var mentionSpan: Spans.MentionChipSpan - for (i in mentionSpans.indices) { - mentionSpan = mentionSpans[i] - var mentionId = mentionSpan.id - val shouldQuote = mentionId.contains(" ") || - mentionId.contains("@") || - mentionId.startsWith("guest/") || - mentionId.startsWith("group/") || - mentionId.startsWith("email/") || - mentionId.startsWith("team/") - if (shouldQuote) { - mentionId = "\"" + mentionId + "\"" + if(message.message != null){ + val editedMessage = ChatUtils.getParsedMessage(message.message, message.messageParameters) + binding.fragmentEditView.editMessage.text = editedMessage + binding.fragmentMessageInputView.inputEditText.setText(editedMessage) + val end = binding.fragmentMessageInputView.inputEditText.text.length + binding.fragmentMessageInputView.inputEditText.setSelection(end) + binding.fragmentMessageInputView.messageSendButton.visibility = View.GONE + binding.fragmentMessageInputView.recordAudioButton.visibility = View.GONE + binding.fragmentMessageInputView.editMessageButton.visibility = View.VISIBLE + binding.fragmentEditView.editMessageView.visibility = View.VISIBLE + binding.fragmentMessageInputView.attachmentButton.visibility = View.GONE + binding.fragmentMessageInputView.editMessageButton.setOnClickListener { + val inputEditText = binding.fragmentMessageInputView.inputEditText!!.editableText + val mentionSpans = inputEditText.getSpans( + 0, + inputEditText.length, + Spans.MentionChipSpan::class.java + ) + var mentionSpan: Spans.MentionChipSpan + for (i in mentionSpans.indices) { + mentionSpan = mentionSpans[i] + var mentionId = mentionSpan.id + val shouldQuote = mentionId.contains(" ") || + mentionId.contains("@") || + mentionId.startsWith("guest/") || + mentionId.startsWith("group/") || + mentionId.startsWith("email/") || + mentionId.startsWith("team/") + if (shouldQuote) { + mentionId = "\"" + mentionId + "\"" + } + inputEditText.replace( + inputEditText.getSpanStart(mentionSpan), + inputEditText.getSpanEnd(mentionSpan), + "@$mentionId" + ) } - inputEditText.replace( - inputEditText.getSpanStart(mentionSpan), - inputEditText.getSpanEnd(mentionSpan), - "@$mentionId" - ) - } - val message = chatActivity.messageInputViewModel.getEditChatMessage.value as ChatMessage - if (message.message!!.trim() != inputEditText.trim()) { - val editedMessage = messageUtils.processEditMessageParameters( - message.messageParameters!!, - message, - inputEditText.toString() - ) - editMessageAPI(message, editedMessage.toString()) + val message = chatActivity.messageInputViewModel.getEditChatMessage.value as ChatMessage + if (message.message!!.trim() != inputEditText.trim()) { + val editedMessage = messageUtils.processEditMessageParameters( + message.messageParameters!!, + message, + inputEditText.toString() + ) + editMessageAPI(message, editedMessage.toString()) + } + clearEditUI() + } + binding.fragmentEditView.clearEdit.setOnClickListener { + clearEditUI() } - clearEditUI() - } - binding.fragmentEditView.clearEdit.setOnClickListener { - clearEditUI() } }