Skip to content

Commit 02353fc

Browse files
committed
fix: observe roles flow before space members to avoid empty roles in the list
1 parent cb10366 commit 02353fc

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/members/SpaceMembersFragment.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,27 @@ class SpaceMembersFragment : Fragment() {
6767
adapter = spaceMembersAdapter
6868
}
6969

70-
collectLatestLifecycleFlow(spaceMembersViewModel.spaceMembers) { event ->
70+
collectLatestLifecycleFlow(spaceMembersViewModel.roles) { event ->
7171
event?.let {
7272
when (val uiResult = event.peekContent()) {
7373
is UIResult.Success -> {
74-
uiResult.data?.let { spaceMembersAdapter.setSpaceMembers(it, roles) }
74+
uiResult.data?.let {
75+
roles = it
76+
spaceMembersViewModel.getSpaceMembers()
77+
}
7578
}
7679
is UIResult.Loading -> { }
7780
is UIResult.Error -> { }
7881
}
7982
}
8083
}
8184

82-
collectLatestLifecycleFlow(spaceMembersViewModel.roles) { event ->
85+
collectLatestLifecycleFlow(spaceMembersViewModel.spaceMembers) { event ->
8386
event?.let {
8487
when (val uiResult = event.peekContent()) {
8588
is UIResult.Success -> {
8689
uiResult.data?.let {
87-
roles = it
88-
spaceMembersViewModel.getSpaceMembers()
90+
if (roles.isNotEmpty()) { spaceMembersAdapter.setSpaceMembers(it, roles) }
8991
}
9092
}
9193
is UIResult.Loading -> { }

0 commit comments

Comments
 (0)