Skip to content

userId cannot be null for accounts #5588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sowjanyakch wants to merge 2 commits into
base: master
Choose a base branch
from
Open

userId cannot be null for accounts #5588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5529304
userId cannot be null for accounts
sowjanyakch Nov 25, 2025
3493ef3
display missing accounts
sowjanyakch Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/com/nextcloud/talk/account/data/model/AccountItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ package com.nextcloud.talk.account.data.model

import com.nextcloud.talk.data.user.model.User

data class AccountItem(val user: User, val userId: String?, val pendingInvitation: Int)
data class AccountItem(val user: User, val pendingInvitation: Int)
10 changes: 5 additions & 5 deletions app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogCompose.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class ChooseAccountDialogCompose {
userManager.users.blockingGet().forEach { user ->
if (!user.current) {
val pendingCount = getPendingInvitations(invitationsUiState)
addAccountToList(user, user.userId ?: user.username, pendingCount)
addAccountToList(user, pendingCount)
}
}
}
Expand Down Expand Up @@ -248,7 +248,7 @@ class ChooseAccountDialogCompose {
AsyncImage(
model = ApiUtils.getUrlForAvatar(
userItem.user.baseUrl,
userItem.user.userId ?: userItem.user.username,
userItem.user.userId,
true
),
contentDescription = null,
Expand Down Expand Up @@ -310,8 +310,8 @@ class ChooseAccountDialogCompose {
private val TAG = ChooseAccountDialogCompose::class.simpleName
}

private fun addAccountToList(user: User, userId: String?, pendingInvitations: Int) {
userItems.add(AccountItem(user, userId, pendingInvitations))
private fun addAccountToList(user: User, pendingInvitations: Int) {
userItems.add(AccountItem(user, pendingInvitations))
}
}

Expand Down Expand Up @@ -359,7 +359,7 @@ private fun ChooseAccountDialogContent(
)
LazyColumn(modifier = Modifier.padding(start = 8.dp).weight(1f, fill = false)) {
items(accountItems) { user ->
if (user.userId != currentUser.userId) {
if (user.user.userId + user.user.baseUrl != currentUser.userId + currentUser.baseUrl) {
accountRowContent(user)
}
}
Expand Down
Loading