mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-26 19:36:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Even if it's not happening, do not add the search term if already present in the results.

Browse source
This commit is contained in:
Benoit Marty 2020-04-22 19:20:13 +02:00
parent 3163bc8b80
commit 06cf59bca7
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
vector/src/main/java/im/vector/riotx/features/createdirect/DirectoryUsersController.kt
View file

@ -60,20 +60,24 @@ class DirectoryUsersController @Inject constructor(private val session: Session,
when (val asyncUsers = currentState.directoryUsers) {
is Uninitialized -> renderEmptyState(false)
is Loading -> renderLoading()
is Success -> renderSuccess(getAsyncUsers(currentState), currentState.selectedUsers.map { it.userId }, hasSearch)
is Success -> renderSuccess(
computeUsersList(asyncUsers(), currentState.directorySearchTerm),
currentState.selectedUsers.map { it.userId },
hasSearch
)
is Fail -> renderFailure(asyncUsers.error)
}
}
private fun getAsyncUsers(currentState: CreateDirectRoomViewState): List<User> {
return currentState
.directoryUsers()
?.toMutableList()
?.apply {
currentState.directorySearchTerm
.takeIf { MatrixPatterns.isUserId(it) }
?.let { add(User(it)) }
} ?: emptyList()
/**
* Eventually add the searched terms, if it is a userId, and if not already present in the result
*/
private fun computeUsersList(directoryUsers: List<User>, searchTerms: String): List<User> {
return directoryUsers +
searchTerms
.takeIf { terms -> MatrixPatterns.isUserId(terms) && !directoryUsers.any { it.userId == terms } }
?.let { listOf(User(it)) }
.orEmpty()
}
private fun renderLoading() {