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

android, desktop: lock on changing user (#3669)

Browse Source 
* android, desktop: lock on changing user

* rename

* change

* change
This commit is contained in:
Stanislav Dmitrenko 2024-01-11 04:31:16 +07:00 committed by GitHub
parent afbb3b4e4b
commit 9e369c3ac9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
View File

@ -114,7 +114,8 @@ object ChatModel {
val clipboardHasText = mutableStateOf(false) val clipboardHasText = mutableStateOf(false)
var updatingChatsMutex: Mutex = Mutex() val updatingChatsMutex: Mutex = Mutex()
val changingActiveUserMutex: Mutex = Mutex()
val desktopNoUserNoRemote: Boolean @Composable get() = appPlatform.isDesktop && currentUser.value == null && currentRemoteHost.value == null val desktopNoUserNoRemote: Boolean @Composable get() = appPlatform.isDesktop && currentUser.value == null && currentRemoteHost.value == null
fun desktopNoUserNoRemote(): Boolean = appPlatform.isDesktop && currentUser.value == null && currentRemoteHost.value == null fun desktopNoUserNoRemote(): Boolean = appPlatform.isDesktop && currentUser.value == null && currentRemoteHost.value == null

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

@ -5,6 +5,7 @@ import androidx.compose.runtime.*
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.painter.Painter
import chat.simplex.common.model.ChatModel.updatingChatsMutex import chat.simplex.common.model.ChatModel.updatingChatsMutex
import chat.simplex.common.model.ChatModel.changingActiveUserMutex
import dev.icerock.moko.resources.compose.painterResource import dev.icerock.moko.resources.compose.painterResource
import chat.simplex.common.platform.* import chat.simplex.common.platform.*
import chat.simplex.common.ui.theme.* import chat.simplex.common.ui.theme.*
@ -335,14 +336,14 @@ object ChatController {
var lastMsgReceivedTimestamp: Long = System.currentTimeMillis() var lastMsgReceivedTimestamp: Long = System.currentTimeMillis()
private set private set
private fun currentUserId(funcName: String): Long { private suspend fun currentUserId(funcName: String): Long = changingActiveUserMutex.withLock {
val userId = chatModel.currentUser.value?.userId val userId = chatModel.currentUser.value?.userId
if (userId == null) { if (userId == null) {
val error = "$funcName: no current user" val error = "$funcName: no current user"
Log.e(TAG, error) Log.e(TAG, error)
throw Exception(error) throw Exception(error)
} }
return userId userId
} }
suspend fun startChat(user: User) { suspend fun startChat(user: User) {
@ -408,8 +409,11 @@ object ChatController {
} }
suspend fun changeActiveUser_(rhId: Long?, toUserId: Long, viewPwd: String?) { suspend fun changeActiveUser_(rhId: Long?, toUserId: Long, viewPwd: String?) {
val currentUser = apiSetActiveUser(rhId, toUserId, viewPwd) val currentUser = changingActiveUserMutex.withLock {
chatModel.currentUser.value = currentUser apiSetActiveUser(rhId, toUserId, viewPwd).also {
chatModel.currentUser.value = it
}
}
val users = listUsers(rhId) val users = listUsers(rhId)
chatModel.users.clear() chatModel.users.clear()
chatModel.users.addAll(users) chatModel.users.addAll(users)
@ -886,10 +890,7 @@ object ChatController {
suspend fun apiAddContact(rh: Long?, incognito: Boolean): Pair<Pair<String, PendingContactConnection>?, (() -> Unit)?> { suspend fun apiAddContact(rh: Long?, incognito: Boolean): Pair<Pair<String, PendingContactConnection>?, (() -> Unit)?> {
val userId = chatModel.currentUser.value?.userId ?: run { val userId = try { currentUserId("apiAddContact") } catch (e: Exception) { return null to null }
Log.e(TAG, "apiAddContact: no current user")
return null to null
}
val r = sendCmd(rh, CC.APIAddContact(userId, incognito)) val r = sendCmd(rh, CC.APIAddContact(userId, incognito))
return when (r) { return when (r) {
is CR.Invitation -> (r.connReqInvitation to r.connection) to null is CR.Invitation -> (r.connReqInvitation to r.connection) to null
@ -918,10 +919,7 @@ object ChatController {
} }
suspend fun apiConnect(rh: Long?, incognito: Boolean, connReq: String): PendingContactConnection? { suspend fun apiConnect(rh: Long?, incognito: Boolean, connReq: String): PendingContactConnection? {
val userId = chatModel.currentUser.value?.userId ?: run { val userId = try { currentUserId("apiConnect") } catch (e: Exception) { return null }
Log.e(TAG, "apiConnect: no current user")
return null
}
val r = sendCmd(rh, CC.APIConnect(userId, incognito, connReq)) val r = sendCmd(rh, CC.APIConnect(userId, incognito, connReq))
when { when {
r is CR.SentConfirmation -> return r.connection r is CR.SentConfirmation -> return r.connection
@ -960,10 +958,7 @@ object ChatController {
} }
suspend fun apiConnectContactViaAddress(rh: Long?, incognito: Boolean, contactId: Long): Contact? { suspend fun apiConnectContactViaAddress(rh: Long?, incognito: Boolean, contactId: Long): Contact? {
val userId = chatModel.currentUser.value?.userId ?: run { val userId = try { currentUserId("apiConnectContactViaAddress") } catch (e: Exception) { return null }
Log.e(TAG, "apiConnectContactViaAddress: no current user")
return null
}
val r = sendCmd(rh, CC.ApiConnectContactViaAddress(userId, incognito, contactId)) val r = sendCmd(rh, CC.ApiConnectContactViaAddress(userId, incognito, contactId))
when { when {
r is CR.SentInvitationToContact -> return r.contact r is CR.SentInvitationToContact -> return r.contact