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

Merge remote-tracking branch 'origin/feature/edit_messages' into feature/edit_messages

Browse Source
This commit is contained in:
sowjanyakch 2024-02-10 20:50:44 +01:00
commit 8789edbc27
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -920,6 +920,7 @@ class ChatActivity :
} }
} }
message.message = messageEdited.ocs?.data?.parentMessage?.text message.message = messageEdited.ocs?.data?.parentMessage?.text
message.lastEditTimestamp = System.currentTimeMillis()
adapter?.update(message) adapter?.update(message)
adapter?.notifyDataSetChanged() adapter?.notifyDataSetChanged()
@ -3857,6 +3858,10 @@ class ChatActivity :
// delete poll system messages // delete poll system messages
chatMessageIterator.remove() chatMessageIterator.remove()
} else if (isEditMessage(currentMessage)) { } else if (isEditMessage(currentMessage)) {
if (!chatMessageMap.containsKey(currentMessage.value.parentMessage!!.id)) {
setMessageAsEdited(currentMessage.value.parentMessage)
}
chatMessageIterator.remove() chatMessageIterator.remove()
} }
} }
@ -4464,6 +4469,17 @@ class ChatActivity :
adapter?.update(messageTemp) adapter?.update(messageTemp)
} }
private fun setMessageAsEdited(message: IMessage?) {
val messageTemp = message as ChatMessage
messageTemp.lastEditTimestamp = message.timestamp
messageTemp.isOneToOneConversation =
currentConversation?.type == ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL
messageTemp.activeUser = conversationUser
adapter?.update(messageTemp)
}
private fun updateAdapterForReaction(message: IMessage?) { private fun updateAdapterForReaction(message: IMessage?) {
val messageTemp = message as ChatMessage val messageTemp = message as ChatMessage