Skip to content

Commit 78cd0e7

Browse files
committed
fix to correctly sort out only child thread messages in message search results
before, it also sorted out normal messages with replies Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
1 parent 2c3dc23 commit 78cd0e7

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

app/src/main/java/com/nextcloud/talk/contextchat/ContextChatViewModel.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class ContextChatViewModel @Inject constructor(private val chatNetworkDataSource
6464
)
6565

6666
if (threadId.isNullOrEmpty()) {
67-
messages = messages.filter { it.id == it.threadId }
67+
messages = messages.filter { !isThreadChildMessage(it) }
6868
}
6969

7070
val subTitle = if (threadId?.isNotEmpty() == true) {
@@ -83,6 +83,10 @@ class ContextChatViewModel @Inject constructor(private val chatNetworkDataSource
8383
}
8484
}
8585

86+
fun isThreadChildMessage(currentMessage: ChatMessageJson): Boolean =
87+
currentMessage.hasThread &&
88+
currentMessage.threadId != currentMessage.id
89+
8690
fun clearContextChatState() {
8791
_getContextChatMessagesState.value = ContextChatRetrieveUiState.None
8892
}

0 commit comments

Comments
 (0)