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

android: fix deleting active and hidden user profile, fix incorrect log

Browse Source
This commit is contained in:
Evgeny Poberezkin
2023-03-25 15:25:52 +00:00
parent 9f8cbe140d
commit c0bbe77788
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt
View File

@@ -266,9 +266,13 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
} }
private fun currentUserId(funcName: String): Long { private fun currentUserId(funcName: String): Long {
val userId = chatModel.currentUser.value?.userId
if (userId == null) {
val error = "$funcName: no current user" val error = "$funcName: no current user"
Log.e(TAG, error) Log.e(TAG, error)
return chatModel.currentUser.value?.userId ?: throw Exception(error) throw Exception(error)
}
return userId
} }
suspend fun startChat(user: User) { suspend fun startChat(user: User) {
@@ -314,6 +318,7 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
suspend fun changeActiveUser_(toUserId: Long, viewPwd: String?) { suspend fun changeActiveUser_(toUserId: Long, viewPwd: String?) {
val currentUser = apiSetActiveUser(toUserId, viewPwd) val currentUser = apiSetActiveUser(toUserId, viewPwd)
chatModel.currentUser.value = currentUser chatModel.currentUser.value = currentUser
Log.e(TAG, "currentUser ${currentUser?.userId}")
val users = listUsers() val users = listUsers()
chatModel.users.clear() chatModel.users.clear()
chatModel.users.addAll(users) chatModel.users.addAll(users)

2
apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserProfilesView.kt
View File

@@ -267,7 +267,7 @@ private fun removeUser(m: ChatModel, user: User, users: List<User>, delSMPQueues
val newActive = users.firstOrNull { u -> !u.activeUser && !u.hidden } val newActive = users.firstOrNull { u -> !u.activeUser && !u.hidden }
if (newActive != null) { if (newActive != null) {
m.controller.changeActiveUser_(newActive.userId, null) m.controller.changeActiveUser_(newActive.userId, null)
deleteUser(user) deleteUser(user.copy(activeUser = false))
} }
} else { } else {
deleteUser(user) deleteUser(user)