From 1794fb66fd5e55e2ca319d96ab1f13e3d2f8f3e9 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Mon, 22 Dec 2025 18:00:15 +0100 Subject: [PATCH 1/2] don't update message flow Signed-off-by: sowjanyakch --- .../talk/chat/data/network/OfflineFirstChatRepository.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt b/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt index 11fb8e4497..efe3ea6f43 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt @@ -687,7 +687,8 @@ class OfflineFirstChatRepository @Inject constructor( when (messageJson.systemMessageType) { ChatMessage.SystemMessageType.REACTION, ChatMessage.SystemMessageType.REACTION_REVOKED, - ChatMessage.SystemMessageType.REACTION_DELETED, + ChatMessage.SystemMessageType.REACTION_DELETED -> { + } ChatMessage.SystemMessageType.MESSAGE_DELETED, ChatMessage.SystemMessageType.POLL_VOTED, ChatMessage.SystemMessageType.MESSAGE_EDITED -> { From f831bd4a1d7895925f8ad231e784649862a53d93 Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Mon, 22 Dec 2025 18:38:02 +0100 Subject: [PATCH 2/2] don't show zero emoji count Signed-off-by: sowjanyakch --- .../repositories/reactions/ReactionsRepositoryImpl.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepositoryImpl.kt index 2fe25bd342..11963d444a 100644 --- a/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepositoryImpl.kt @@ -144,11 +144,13 @@ class ReactionsRepositoryImpl @Inject constructor(private val ncApi: NcApi, priv message.reactionsSelf = ArrayList() } - var amount = message.reactions!![emoji] - if (amount == null) { - amount = 0 + val currentEmojiCount = message.reactions!![emoji] ?: 0 + val newEmojiCount = currentEmojiCount - 1 + if (newEmojiCount <= 0) { + message.reactions!!.remove(emoji) + } else { + message.reactions!![emoji] = newEmojiCount } - message.reactions!![emoji] = amount - 1 message.reactionsSelf!!.remove(emoji) // 3. Call DAO again, to update the singular ChatMessageEntity with params