Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-25 15:08:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

use orEmpty()

Browse Source
This commit is contained in:
Benoit Marty 2021-04-20 18:16:03 +02:00
parent 2a3694d8b7
commit 5848ec21f7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/invite/InviteUsersToRoomViewModel.kt
View File

@ -92,6 +92,6 @@ class InviteUsersToRoomViewModel @AssistedInject constructor(@Assisted
} }
fun getUserIdsOfRoomMembers(): Set<String> { fun getUserIdsOfRoomMembers(): Set<String> {
return room.roomSummary()?.otherMemberIds?.toSet() ?: emptySet() return room.roomSummary()?.otherMemberIds?.toSet().orEmpty()
} }
} }

2
vector/src/main/java/im/vector/app/features/roomdirectory/RoomDirectoryViewModel.kt
View File

@ -87,7 +87,7 @@ class RoomDirectoryViewModel @AssistedInject constructor(
val joinedRoomIds = list val joinedRoomIds = list
?.map { it.roomId } ?.map { it.roomId }
?.toSet() ?.toSet()
?: emptySet() .orEmpty()
setState { setState {
copy(joinedRoomsIds = joinedRoomIds) copy(joinedRoomsIds = joinedRoomIds)

2
vector/src/main/java/im/vector/app/features/userdirectory/UserListViewModel.kt
View File

@ -119,7 +119,7 @@ class UserListViewModel @AssistedInject constructor(@Assisted initialState: User
Single.just(emptyList<User>()) Single.just(emptyList<User>())
} else { } else {
val searchObservable = session.rx() val searchObservable = session.rx()
.searchUsersDirectory(search, 50, state.excludedUserIds ?: emptySet()) .searchUsersDirectory(search, 50, state.excludedUserIds.orEmpty())
.map { users -> .map { users ->
users.sortedBy { it.toMatrixItem().firstLetterOfDisplayName() } users.sortedBy { it.toMatrixItem().firstLetterOfDisplayName() }
} }