From f46f781e65d6ed013ec4af90df4799c64fd3c44b Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Mon, 22 Jan 2024 16:52:48 +0200
Subject: [PATCH] Do not run search with empty query
---
.../feature/select_users/SearchUserDataSource.kt | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/core/src/main/java/org/futo/circles/core/feature/select_users/SearchUserDataSource.kt b/core/src/main/java/org/futo/circles/core/feature/select_users/SearchUserDataSource.kt
index 7b88ab849..27320dc7b 100644
--- a/core/src/main/java/org/futo/circles/core/feature/select_users/SearchUserDataSource.kt
+++ b/core/src/main/java/org/futo/circles/core/feature/select_users/SearchUserDataSource.kt
@@ -41,10 +41,14 @@ class SearchUserDataSource @Inject constructor() {
query: String,
userIdsToExclude: Set<String> = emptySet()
): Flow<List<User>> = flow {
- val userFromDirectory = searchInUsersDirectory(query, userIdsToExclude)
- val userById = searchUserById(query)
- val list = userFromDirectory.toMutableList().apply { userById?.let { add(it) } }
- emit(list.distinctBy { it.userId })
+ if (query.isEmpty()) {
+ emit(emptyList())
+ } else {
+ val userFromDirectory = searchInUsersDirectory(query, userIdsToExclude)
+ val userById = searchUserById(query)
+ val list = userFromDirectory.toMutableList().apply { userById?.let { add(it) } }
+ emit(list.distinctBy { it.userId })
+ }
}.catch { emit(emptyList()) }
private suspend fun searchUserById(query: String) = (createResult {
--
GitLab