gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 06:15:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3855 from nextcloud/bugfix/noid/fixEditTestLostAfter30sec

Browse Source 
fix to keep text of message-editing after 30sec
This commit is contained in:
Sowjanya Kota 2024-04-18 13:53:53 +02:00 committed by GitHub
commit 188aed721d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View File

@ -1159,15 +1159,6 @@ class ChatActivity :
val filters = arrayOfNulls<InputFilter>(1) val filters = arrayOfNulls<InputFilter>(1)
val lengthFilter = CapabilitiesUtil.getMessageMaxLength(spreedCapabilities) val lengthFilter = CapabilitiesUtil.getMessageMaxLength(spreedCapabilities)
binding.editView.editMessageView.visibility = View.GONE
if (editableBehaviorSubject.value!!) {
val editableText = Editable.Factory.getInstance().newEditable(editMessage.message)
binding.messageInputView.inputEditText.text = editableText
binding.messageInputView.inputEditText.setSelection(editableText.length)
binding.editView.editMessage.setText(editMessage.message)
}
filters[0] = InputFilter.LengthFilter(lengthFilter) filters[0] = InputFilter.LengthFilter(lengthFilter)
binding.messageInputView.inputEditText?.filters = filters binding.messageInputView.inputEditText?.filters = filters
@ -1229,9 +1220,6 @@ class ChatActivity :
uploadFile(it.toString(), false) uploadFile(it.toString(), false)
} }
initVoiceRecordButton() initVoiceRecordButton()
if (editableBehaviorSubject.value!!) {
setEditUI()
}
if (sharedText.isNotEmpty()) { if (sharedText.isNotEmpty()) {
binding.messageInputView.inputEditText?.setText(sharedText) binding.messageInputView.inputEditText?.setText(sharedText)
@ -1245,17 +1233,6 @@ class ChatActivity :
submitMessage(false) submitMessage(false)
} }
binding.messageInputView.editMessageButton.setOnClickListener {
if (editMessage.message == editedTextBehaviorSubject.value!!) {
clearEditUI()
return@setOnClickListener
}
editMessageAPI(editMessage, editedMessageText = editedTextBehaviorSubject.value!!)
}
binding.editView.clearEdit.setOnClickListener {
clearEditUI()
}
if (CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SILENT_SEND)) { if (CapabilitiesUtil.hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.SILENT_SEND)) {
binding.messageInputView.button?.setOnLongClickListener { binding.messageInputView.button?.setOnLongClickListener {
showSendButtonMenu() showSendButtonMenu()
@ -4918,6 +4895,24 @@ class ChatActivity :
editableBehaviorSubject.onNext(true) editableBehaviorSubject.onNext(true)
editMessage = message editMessage = message
initMessageInputView() initMessageInputView()
setEditUI()
val editableText = Editable.Factory.getInstance().newEditable(editMessage.message)
binding.messageInputView.inputEditText.text = editableText
binding.messageInputView.inputEditText.setSelection(editableText.length)
binding.editView.editMessage.text = editMessage.message
binding.messageInputView.editMessageButton.setOnClickListener {
if (editMessage.message == editedTextBehaviorSubject.value!!) {
clearEditUI()
return@setOnClickListener
}
editMessageAPI(editMessage, editedMessageText = editedTextBehaviorSubject.value!!)
}
binding.editView.clearEdit.setOnClickListener {
clearEditUI()
}
} }
companion object { companion object {