dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-05-26 18:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

not use snapshot inside derived state of to avoid crash

Browse Source
This commit is contained in:
Diogo
2024-10-29 21:22:46 +00:00
parent 7ad0a2dd87
commit c681c89657
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatSections.kt
+4 -5
View File
@@ -1,6 +1,5 @@
package chat.simplex.common.views.chat
import androidx.compose.runtime.snapshots.SnapshotStateList
import chat.simplex.common.model.*
import chat.simplex.common.platform.chatModel
import kotlinx.coroutines.Dispatchers
@@ -26,7 +25,7 @@ data class ChatSection (
data class SectionItems (
val mergeCategory: CIMergeCategory?,
val items: SnapshotStateList<ChatItem>,
val items: MutableList<ChatItem>,
val revealed: Boolean,
val showAvatar: MutableSet<Long>,
val itemPositions: MutableMap<Long, Int>
@@ -60,7 +59,7 @@ fun List<ChatItem>.putIntoSections(revealedItems: Set<Long>): List<ChatSection>
SectionItems(
mergeCategory = first.mergeCategory,
items = SnapshotStateList<ChatItem>().also { it.add(first) },
items = mutableListOf<ChatItem>().also { it.add(first) },
revealed = first.mergeCategory == null || revealedItems.contains(first.id),
showAvatar = mutableSetOf<Long>().also {
if (first.chatDir is CIDirection.GroupRcv) {
@@ -105,7 +104,7 @@ fun List<ChatItem>.putIntoSections(revealedItems: Set<Long>): List<ChatSection>
if (existingSection == null) {
val newSection = SectionItems(
mergeCategory = item.mergeCategory,
items = SnapshotStateList<ChatItem>().also { it.add(item) },
items = mutableListOf<ChatItem>().also { it.add(item) },
revealed = item.mergeCategory == null || revealedItems.contains(item.id),
showAvatar = mutableSetOf<Long>().also {
it.add(item.id)
@@ -128,7 +127,7 @@ fun List<ChatItem>.putIntoSections(revealedItems: Set<Long>): List<ChatSection>
} else {
val newSectionItems = SectionItems(
mergeCategory = item.mergeCategory,
items = SnapshotStateList<ChatItem>().also { it.add(item) },
items = mutableListOf<ChatItem>().also { it.add(item) },
revealed = item.mergeCategory == null || revealedItems.contains(item.id),
showAvatar = mutableSetOf<Long>().also {
if (item.chatDir is CIDirection.GroupRcv && (prev.chatDir !is CIDirection.GroupRcv || (prev.chatDir as CIDirection.GroupRcv).groupMember.memberId != item.chatDir.groupMember.memberId)) {
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+1 -1
View File
@@ -1007,7 +1007,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
Spacer(Modifier.size(8.dp))
val reversedChatItems by remember { derivedStateOf { chatModel.chatItems.asReversed() } }
val revealedItems = rememberSaveable { mutableStateOf(setOf<Long>()) }
val sections by remember { derivedStateOf { (reversedChatItems).putIntoSections(revealedItems.value) } }
val sections by remember { derivedStateOf { reversedChatItems.putIntoSections(revealedItems.value) } }
val preloadItemsEnabled = remember { mutableStateOf(true) }
val boundaries = remember { derivedStateOf { sections.map { it.boundary } } }