gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-27 23:49:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

format code

Browse Source 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
sowjanyakch 2025-06-23 19:19:40 +02:00
parent 429f5f1e77
commit 172866160b
No known key found for this signature in database
GPG Key ID: F7AA2A8B65B50220
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt
View File

@ -361,7 +361,7 @@ class MessageInputFragment : Fragment() {
binding.fragmentMessageInputView.inputEditText?.error = null binding.fragmentMessageInputView.inputEditText?.error = null
} }
val editable = binding.fragmentMessageInputView.inputEditText?.editableText val editable = binding.fragmentMessageInputView.inputEditText?.editableText
if (editable != null && binding.fragmentMessageInputView.inputEditText != null) { if (editable != null && binding.fragmentMessageInputView.inputEditText != null) {
val mentionSpans = editable.getSpans( val mentionSpans = editable.getSpans(
@ -924,7 +924,6 @@ class MessageInputFragment : Fragment() {
} }
} }
private fun setEditUI(message: ChatMessage) { private fun setEditUI(message: ChatMessage) {
val editedMessage = ChatUtils.getParsedMessage(message.message, message.messageParameters) val editedMessage = ChatUtils.getParsedMessage(message.message, message.messageParameters)
binding.fragmentEditView.editMessage.text = editedMessage binding.fragmentEditView.editMessage.text = editedMessage
@ -937,7 +936,6 @@ class MessageInputFragment : Fragment() {
binding.fragmentEditView.editMessageView.visibility = View.VISIBLE binding.fragmentEditView.editMessageView.visibility = View.VISIBLE
binding.fragmentMessageInputView.attachmentButton.visibility = View.GONE binding.fragmentMessageInputView.attachmentButton.visibility = View.GONE
binding.fragmentMessageInputView.editMessageButton.setOnClickListener { binding.fragmentMessageInputView.editMessageButton.setOnClickListener {
val inputEditText = binding.fragmentMessageInputView.inputEditText!!.editableText val inputEditText = binding.fragmentMessageInputView.inputEditText!!.editableText
val mentionSpans = inputEditText.getSpans( val mentionSpans = inputEditText.getSpans(
@ -958,14 +956,20 @@ class MessageInputFragment : Fragment() {
if (shouldQuote) { if (shouldQuote) {
mentionId = "\"" + mentionId + "\"" mentionId = "\"" + mentionId + "\""
} }
inputEditText.replace(inputEditText.getSpanStart(mentionSpan), inputEditText.getSpanEnd(mentionSpan), inputEditText.replace(
"@$mentionId") inputEditText.getSpanStart(mentionSpan),
inputEditText.getSpanEnd(mentionSpan),
"@$mentionId"
)
} }
val message = chatActivity.messageInputViewModel.getEditChatMessage.value as ChatMessage val message = chatActivity.messageInputViewModel.getEditChatMessage.value as ChatMessage
if (message.message!!.trim() != inputEditText.trim()) { if (message.message!!.trim() != inputEditText.trim()) {
val editedMessage = messageUtils.processEditMessageParameters(message.messageParameters!!, message, val editedMessage = messageUtils.processEditMessageParameters(
inputEditText.toString()) message.messageParameters!!,
message,
inputEditText.toString()
)
editMessageAPI(message, editedMessage.toString()) editMessageAPI(message, editedMessage.toString())
} }
clearEditUI() clearEditUI()
@ -975,7 +979,6 @@ class MessageInputFragment : Fragment() {
} }
} }
private fun clearEditUI() { private fun clearEditUI() {
binding.fragmentMessageInputView.editMessageButton.visibility = View.GONE binding.fragmentMessageInputView.editMessageButton.visibility = View.GONE
binding.fragmentMessageInputView.inputEditText.setText("") binding.fragmentMessageInputView.inputEditText.setText("")

13
app/src/main/java/com/nextcloud/talk/utils/message/MessageUtils.kt
View File

@ -159,14 +159,12 @@ class MessageUtils(val context: Context) {
return messageStringInternal return messageStringInternal
} }
fun processEditMessageParameters(
fun processEditMessageParameters(
messageParameters: HashMap<String?, HashMap<String?, String?>>?, messageParameters: HashMap<String?, HashMap<String?, String?>>?,
message: ChatMessage?, message: ChatMessage?,
inputEditText:String inputEditText: String
): Spanned { ): Spanned {
var result = inputEditText.toString()
var result = inputEditText.toString()
for ((key, valueMap) in messageParameters!!) { for ((key, valueMap) in messageParameters!!) {
if (key != null) { if (key != null) {
val mentionId = valueMap["mention-id"] val mentionId = valueMap["mention-id"]
@ -179,12 +177,12 @@ class MessageUtils(val context: Context) {
"user", "guest", "email" -> { "user", "guest", "email" -> {
result = result.replace(placeholder, "@$mentionId", ignoreCase = false) result = result.replace(placeholder, "@$mentionId", ignoreCase = false)
} }
"user-group", "circle" ->{ "user-group", "circle" -> {
val mentionId = "\"" + mentionId + "\"" val mentionId = "\"" + mentionId + "\""
result = result.replace(placeholder, "@$mentionId", ignoreCase = false) result = result.replace(placeholder, "@$mentionId", ignoreCase = false)
} }
"call" -> { "call" -> {
result = result.replace(placeholder,"@all", ignoreCase = false ) result = result.replace(placeholder, "@all", ignoreCase = false)
} }
} }
} }
@ -193,7 +191,6 @@ class MessageUtils(val context: Context) {
return SpannableString(result) return SpannableString(result)
} }
private fun defaultMessageParameters( private fun defaultMessageParameters(
messageString: Spanned, messageString: Spanned,
individualHashMap: HashMap<String?, String?>, individualHashMap: HashMap<String?, String?>,