dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-03-31 09:46:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

android: fix bug in chat list (#630)

Browse Source
This commit is contained in:
Evgeny Poberezkin
2022-05-10 15:00:59 +01:00
committed by GitHub
parent 058c0f5895
commit 3d8ccdaa9f
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt
View File

@@ -128,8 +128,8 @@ class ChatModel(val controller: ChatController) {
val res: Boolean
if (i >= 0) {
chat = chats[i]
val pItem = chat.chatItems.last()
if (pItem.id == cItem.id) {
val pItem = chat.chatItems.lastOrNull()
if (pItem?.id == cItem.id) {
chats[i] = chat.copy(chatItems = arrayListOf(cItem))
}
res = false
@@ -158,8 +158,8 @@ class ChatModel(val controller: ChatController) {
val chat: Chat
if (i >= 0) {
chat = chats[i]
val pItem = chat.chatItems.last()
if (pItem.id == cItem.id) {
val pItem = chat.chatItems.lastOrNull()
if (pItem?.id == cItem.id) {
chats[i] = chat.copy(chatItems = arrayListOf(cItem))
}
}
@@ -180,17 +180,17 @@ class ChatModel(val controller: ChatController) {
while (i < chatItems.count()) {
val item = chatItems[i]
if (item.meta.itemStatus is CIStatus.RcvNew) {
chatItems[i] = item.copy(meta=item.meta.copy(itemStatus = CIStatus.RcvRead()))
chatItems[i] = item.withStatus(CIStatus.RcvRead())
}
i += 1
}
val chat = chats[chatIdx]
val pItem = chat.chatItems.lastOrNull()
chats[chatIdx] = chat.copy(
chatItems = chatItems,
chatItems = if (pItem == null) arrayListOf() else arrayListOf(pItem.withStatus(CIStatus.RcvRead())),
chatStats = chat.chatStats.copy(unreadCount = 0, minUnreadItemId = chat.chatItems.last().id + 1)
)
}
}
// func popChat(_ id: String) {
@@ -670,6 +670,8 @@ data class ChatItem (
else -> false
}
fun withStatus(status: CIStatus): ChatItem = this.copy(meta = meta.copy(itemStatus = status))
companion object {
fun getSampleData(
id: Long = 1,