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

list the new profile on Kotlin too when listUsers fails

Browse Source 
The refresh is best-effort, and nothing else adds the profile to
chatModel.users - so a failed listUsers left the picker, which is keyed on
users.size, with no row for the profile just created, and creating it again
fails on the duplicate name. iOS already had this fallback.

Also record in the plan the four review findings left unfixed, with why.
This commit is contained in:
Narasimha-sc
2026-08-07 14:42:16 +00:00
parent b9525704c9
commit 4cb35b79e6
2 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/WelcomeView.kt
+9 -3
View File
@@ -391,11 +391,17 @@ fun createProfileForInvitation(rhId: Long?, onCreated: suspend (User) -> Unit) {
return@withApi
}
// List the new profile even if the reassignment below fails. listUsers throws and
// withApi does not catch, so the cosmetic refresh is guarded.
// withApi does not catch, so the refresh is guarded.
if (chatModel.remoteHostId() == rhId) {
runCatching { controller.listUsers(rhId) }.getOrNull()?.let {
val updatedUsers = runCatching { controller.listUsers(rhId) }.getOrNull()
if (updatedUsers != null) {
chatModel.users.clear()
chatModel.users.addAll(it)
chatModel.users.addAll(updatedUsers)
} else if (chatModel.users.none { it.user.userId == newUser.userId }) {
// listUsers failed, and the picker is keyed on chatModel.users.size - without
// this it shows no row for the profile just created, and creating it again
// fails on the duplicate name.
chatModel.users.add(UserInfo(newUser, 0))
}
}
// onCreated resolves the invitation under whatever is active when it runs, and a