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

desktop: fix incorrect remote host for active user (#3441)

Browse Source
This commit is contained in:
Evgeny Poberezkin
2023-11-23 17:00:13 +00:00
committed by GitHub
parent d837f87f09
commit 4d3529a3e0
2 changed files with 7 additions and 4 deletions
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

@@ -638,6 +638,9 @@ data class User(
val addressShared: Boolean = profile.contactLink != null val addressShared: Boolean = profile.contactLink != null
fun updateRemoteHostId(rh: Long?): User =
if (rh == null) this else this.copy(remoteHostId = rh)
companion object { companion object {
val sampleData = User( val sampleData = User(
remoteHostId = null, remoteHostId = null,

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

@@ -468,7 +468,7 @@ object ChatController {
suspend fun apiGetActiveUser(rh: Long?): User? { suspend fun apiGetActiveUser(rh: Long?): User? {
val r = sendCmd(rh, CC.ShowActiveUser()) val r = sendCmd(rh, CC.ShowActiveUser())
if (r is CR.ActiveUser) return r.user if (r is CR.ActiveUser) return r.user.updateRemoteHostId(rh)
Log.d(TAG, "apiGetActiveUser: ${r.responseType} ${r.details}") Log.d(TAG, "apiGetActiveUser: ${r.responseType} ${r.details}")
chatModel.userCreated.value = false chatModel.userCreated.value = false
return null return null
@@ -476,7 +476,7 @@ object ChatController {
suspend fun apiCreateActiveUser(rh: Long?, p: Profile?, sameServers: Boolean = false, pastTimestamp: Boolean = false): User? { suspend fun apiCreateActiveUser(rh: Long?, p: Profile?, sameServers: Boolean = false, pastTimestamp: Boolean = false): User? {
val r = sendCmd(rh, CC.CreateActiveUser(p, sameServers = sameServers, pastTimestamp = pastTimestamp)) val r = sendCmd(rh, CC.CreateActiveUser(p, sameServers = sameServers, pastTimestamp = pastTimestamp))
if (r is CR.ActiveUser) return r.user if (r is CR.ActiveUser) return r.user.updateRemoteHostId(rh)
else if ( else if (
r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore && r.chatError.storeError is StoreError.DuplicateName || r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore && r.chatError.storeError is StoreError.DuplicateName ||
r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorChat && r.chatError.errorType is ChatErrorType.UserExists r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorChat && r.chatError.errorType is ChatErrorType.UserExists
@@ -501,7 +501,7 @@ object ChatController {
suspend fun apiSetActiveUser(rh: Long?, userId: Long, viewPwd: String?): User { suspend fun apiSetActiveUser(rh: Long?, userId: Long, viewPwd: String?): User {
val r = sendCmd(rh, CC.ApiSetActiveUser(userId, viewPwd)) val r = sendCmd(rh, CC.ApiSetActiveUser(userId, viewPwd))
if (r is CR.ActiveUser) return if (rh == null) r.user else r.user.copy(remoteHostId = rh) if (r is CR.ActiveUser) return r.user.updateRemoteHostId(rh)
Log.d(TAG, "apiSetActiveUser: ${r.responseType} ${r.details}") Log.d(TAG, "apiSetActiveUser: ${r.responseType} ${r.details}")
throw Exception("failed to set the user as active ${r.responseType} ${r.details}") throw Exception("failed to set the user as active ${r.responseType} ${r.details}")
} }
@@ -538,7 +538,7 @@ object ChatController {
private suspend fun setUserPrivacy(rh: Long?, cmd: CC): User { private suspend fun setUserPrivacy(rh: Long?, cmd: CC): User {
val r = sendCmd(rh, cmd) val r = sendCmd(rh, cmd)
if (r is CR.UserPrivacy) return if (rh == null) r.updatedUser else r.updatedUser.copy(remoteHostId = rh) if (r is CR.UserPrivacy) return r.updatedUser.updateRemoteHostId(rh)
else throw Exception("Failed to change user privacy: ${r.responseType} ${r.details}") else throw Exception("Failed to change user privacy: ${r.responseType} ${r.details}")
} }