Skip to content

Commit

Permalink
fix(RC): team members are not included when observing all users list …
Browse files Browse the repository at this point in the history 
…(WPB-3261) (#2054)
  • Loading branch information
@MohamadJaara
MohamadJaara authored Aug 3, 2023
1 parent 678a6c4 commit 9bd97e5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ...otlin/com/wire/android/ui/home/conversations/details/AddMembersToConversationViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class AddMembersToConversationViewModel @Inject constructor(
}
}

override fun getInitialContacts(): Flow<SearchResult> =
override suspend fun getInitialContacts(): Flow<SearchResult> =
getAllContactsNotInConversation(conversationId).map { result ->
when (result) {
is Result.Failure -> SearchResult.Failure(R.string.label_general_error)
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/com/wire/android/ui/home/conversations/search/SearchPeopleViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ open class SearchAllPeopleViewModel(
}
}

override fun getInitialContacts(): Flow<SearchResult> = getAllKnownUsers()
override suspend fun getInitialContacts(): Flow<SearchResult> = getAllKnownUsers()
.map { result ->
when (result) {
is GetAllContactsResult.Failure -> SearchResult.Failure(R.string.label_general_error)
Expand Down Expand Up @@ -265,7 +265,7 @@ abstract class SearchPeopleViewModel(
.asStateFlow()
.debounce(DEFAULT_SEARCH_QUERY_DEBOUNCE)

fun initialContactResultFlow() = getInitialContacts().map { result ->
suspend fun initialContactResultFlow() = getInitialContacts().map { result ->
when (result) {
is SearchResult.Failure -> {
SearchResultState.Failure(result.failureString)
Expand Down Expand Up @@ -359,7 +359,7 @@ abstract class SearchPeopleViewModel(
}
}

abstract fun getInitialContacts(): Flow<SearchResult>
abstract suspend fun getInitialContacts(): Flow<SearchResult>

abstract suspend fun getInitialServices(): Flow<SearchResult>
}
Expand Down
2 changes: 1 addition & 1 deletion kalium
Submodule kalium updated 39 files
+14 −9 .github/workflows/cherry-pick-rc-to-develop.yml
+94 −60 .github/workflows/gradle-android-tests.yml
+33 −0 .github/workflows/gradle-ios-tests.yml
+31 −0 .github/workflows/gradle-jvm-tests.yml
+2 −2 detekt/baseline.xml
+5 −0 logic/src/androidInstrumentedTest/kotlin/com/wire/kalium/logic/feature/call/CallManagerTest.kt
+4 −0 logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/call/CallManagerImpl.kt
+2 −0 logic/src/appleMain/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt
+13 −3 logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/CallManagerImpl.kt
+4 −1 logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt
+3 −41 logic/src/commonJvmAndroid/kotlin/com/wire/kalium/logic/feature/call/scenario/OnClientsRequest.kt
+2 −1 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/publicuser/PublicUserMapper.kt
+2 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/user/UserRepository.kt
+15 −4 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+1 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/CallManager.kt
+4 −1 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/CallsScope.kt
+2 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/GlobalCallManager.kt
+74 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/usecase/ConversationClientsInCallUpdater.kt
+3 −1 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/usecase/EndCallOnConversationChangeUseCase.kt
+2 −2 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/publicuser/GetAllContactsUseCase.kt
+4 −5 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/AnswerCallUseCaseTest.kt
+103 −0 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/ConversationClientsInCallUpdaterTest.kt
+10 −1 .../src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/EndCallOnConversationChangeUseCaseTest.kt
+4 −5 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/EndCallUseCaseTest.kt
+2 −2 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/FlipToBackCameraUseCaseTest.kt
+2 −2 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/FlipToFrontCameraUseCaseTest.kt
+3 −3 ...ommonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/GetAllCallsWithSortedParticipantsUseCaseTest.kt
+0 −2 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/GetIncomingCallsUseCaseTest.kt
+0 −2 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/IsCallRunningUseCaseTest.kt
+4 −3 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/MuteCallUseCaseTest.kt
+1 −7 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/ObserveOngoingCallsUseCaseTest.kt
+3 −2 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/RejectCallUseCaseTest.kt
+2 −2 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/StartCallUseCaseTest.kt
+4 −3 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/UnMuteCallUseCaseTest.kt
+4 −2 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/UpdateVideoStateUseCaseTest.kt
+1 −1 persistence/src/commonMain/db_user/com/wire/kalium/persistence/Users.sq
+1 −1 persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/UserDAO.kt
+113 −111 persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/UserDAOImpl.kt
+28 −0 persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/UserDAOTest.kt

0 comments on commit 9bd97e5

Please sign in to comment.