Skip to content

Commit 57f0029

Browse files
filter out user only if userId and baseUrl are the same
Signed-off-by: tobiasKaminsky <[email protected]>
1 parent 59231f6 commit 57f0029

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogCompose.kt

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,9 @@ class ChooseAccountDialogCompose {
257257
.size(40.dp)
258258
.clip(CircleShape)
259259
)
260-
Column(modifier = Modifier.padding(start = 12.dp).weight(1f)) {
260+
Column(modifier = Modifier
261+
.padding(start = 12.dp)
262+
.weight(1f)) {
261263
Text(
262264
text = userItem.user.displayName ?: userItem.user.username ?: ""
263265
)
@@ -357,13 +359,16 @@ private fun ChooseAccountDialogContent(
357359
HorizontalDivider(
358360
modifier = Modifier.padding(vertical = 8.dp)
359361
)
360-
LazyColumn(modifier = Modifier.padding(start = 8.dp).weight(1f, fill = false)) {
362+
LazyColumn(modifier = Modifier
363+
.padding(start = 8.dp)
364+
.weight(1f, fill = false)) {
361365
items(accountItems) { user ->
362-
if (user.userId != currentUser.userId) {
366+
if (user.user.userId + user.user.baseUrl != currentUser.userId + currentUser.baseUrl) {
363367
accountRowContent(user)
364368
}
365369
}
366370
}
371+
}
367372

368373
OnlineActions(
369374
onAddAccountClick = onAddAccountClick,
@@ -474,7 +479,9 @@ private fun OnlineActions(onAddAccountClick: () -> Unit, onOpenSettingsClick: ()
474479
if (isOnline) {
475480
TextButton(onClick = onAddAccountClick, modifier = Modifier.fillMaxWidth()) {
476481
Row(
477-
modifier = Modifier.padding(start = 16.dp, top = 8.dp).fillMaxWidth(),
482+
modifier = Modifier
483+
.padding(start = 16.dp, top = 8.dp)
484+
.fillMaxWidth(),
478485
verticalAlignment = Alignment.CenterVertically
479486
) {
480487
Icon(
@@ -494,7 +501,9 @@ private fun OnlineActions(onAddAccountClick: () -> Unit, onOpenSettingsClick: ()
494501

495502
TextButton(onClick = onOpenSettingsClick, modifier = Modifier.fillMaxWidth()) {
496503
Row(
497-
modifier = Modifier.padding(start = 16.dp, top = 8.dp, bottom = 16.dp).fillMaxWidth(),
504+
modifier = Modifier
505+
.padding(start = 16.dp, top = 8.dp, bottom = 16.dp)
506+
.fillMaxWidth(),
498507
verticalAlignment = Alignment.CenterVertically
499508
) {
500509
Icon(

0 commit comments

Comments
 (0)