IntenseFinance/simplex-chat
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: don't show alert when not needed after changing user concurrently

Browse Source
This commit is contained in:
Avently 2024-01-10 22:06:23 +07:00
parent 25a4719414
commit 677eedfa8d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt
View File

@ -80,7 +80,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
updatingChatsMutex.withLock {
kotlin.runCatching {
val currentUserId = chatModel.currentUser.value?.userId
val chats = ArrayList(chatController.apiGetChats(chatModel.remoteHostId()))
val chats = ArrayList(chatController.apiGetChatsWithoutAlert(chatModel.remoteHostId()) ?: return@runCatching)
/** Active user can be changed in background while [ChatController.apiGetChats] is executing */
if (chatModel.currentUser.value?.userId == currentUserId) {
val currentChatId = chatModel.chatId.value

9
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
View File

@ -654,6 +654,15 @@ object ChatController {
return emptyList()
}
// It's useful for situations when active user can be changed concurrently and there is no need to show alert in case of failure
suspend fun apiGetChatsWithoutAlert(rh: Long?): List<Chat>? {
val userId = kotlin.runCatching { currentUserId("apiGetChats") }.getOrElse { return null }
val r = sendCmd(rh, CC.ApiGetChats(userId))
if (r is CR.ApiChats) return if (rh == null) r.chats else r.chats.map { it.copy(remoteHostId = rh) }
Log.e(TAG, "failed getting the list of chats: ${r.responseType} ${r.details}")
return null
}
suspend fun apiGetChat(rh: Long?, type: ChatType, id: Long, pagination: ChatPagination = ChatPagination.Last(ChatPagination.INITIAL_COUNT), search: String = ""): Chat? {
val r = sendCmd(rh, CC.ApiGetChat(type, id, pagination, search))
if (r is CR.ApiChat) return if (rh == null) r.chat else r.chat.copy(remoteHostId = rh)