Skip to content

Commit 982f787

Browse files
authored
Merge pull request #6619 from nextcloud/bugfix/noid/hideUnpinnedSystemMessage
hide system messages for unpin messages
2 parents f873fc1 + 17720e6 commit 982f787

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1608,7 +1608,8 @@ class ChatViewModel @AssistedInject constructor(
16081608
isReactionsMessage(currentMessage) ||
16091609
isPollVotedMessage(currentMessage) ||
16101610
isEditMessage(currentMessage) ||
1611-
isThreadCreatedMessage(currentMessage)
1611+
isThreadCreatedMessage(currentMessage) ||
1612+
isUnpinnedMessage(currentMessage)
16121613

16131614
val chatMessageMap = chatMessageList.associateBy { it.jsonMessageId }.toMutableMap()
16141615
val chatMessageIterator = chatMessageMap.iterator()
@@ -1669,6 +1670,9 @@ class ChatViewModel @AssistedInject constructor(
16691670
private fun isPollVotedMessage(currentMessage: MutableMap.MutableEntry<Int, ChatMessage>): Boolean =
16701671
currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.POLL_VOTED
16711672

1673+
private fun isUnpinnedMessage(currentMessage: MutableMap.MutableEntry<Int, ChatMessage>): Boolean =
1674+
currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.MESSAGE_UNPINNED
1675+
16721676
private fun handleThreadMessages(chatMessageList: List<ChatMessage>): List<ChatMessage> {
16731677
fun isThreadChildMessage(currentMessage: MutableMap.MutableEntry<Int, ChatMessage>): Boolean =
16741678
currentMessage.value.isThread &&

0 commit comments

Comments
 (0)