mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-17 17:55:02 +01:00
fix to keep text of message-editing after 30sec
without this fix, the text when editing a message was lost after pulling chat messages (30sec), because inputEditText was initialized again with the initial text As a fix, message editing is only initialized once when the edit button was clicked. Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
parent
5967a06ff2
commit
8a8b128ac6
@ -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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user