Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fetch MLS status on every conversation opening [WPB-8610] #2884

Merged
merged 6 commits into from
Apr 15, 2024
Merged

fix: Fetch MLS status on every conversation opening [WPB-8610] #2884

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
864e2a2
fix: Fetch MLS status on every conversation opening
borichellow Apr 11, 2024
e05f12b
Merge branch 'release/candidate' into fix/fetch_mls_status_on_every_c…
mchenani Apr 12, 2024
b4a8598
Update kalium version
borichellow Apr 15, 2024
7039b31
Merge branch 'release/candidate' into fix/fetch_mls_status_on_every_c…
borichellow Apr 15, 2024
2152c62
Merge branch 'fix/fetch_mls_status_on_every_conversation_opening' of …
borichellow Apr 15, 2024
9b4fc4c
Merge branch 'release/candidate' into fix/fetch_mls_status_on_every_c…
borichellow Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/src/main/kotlin/com/wire/android/di/CoreLogicModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import com.wire.kalium.logic.feature.connection.BlockUserUseCase
import com.wire.kalium.logic.feature.connection.UnblockUserUseCase
import com.wire.kalium.logic.feature.conversation.ObserveOtherUserSecurityClassificationLabelUseCase
import com.wire.kalium.logic.feature.conversation.ObserveSecurityClassificationLabelUseCase
import com.wire.kalium.logic.feature.e2ei.usecase.FetchConversationMLSVerificationStatusUseCase
import com.wire.kalium.logic.feature.featureConfig.ObserveIsAppLockEditableUseCase
import com.wire.kalium.logic.feature.selfDeletingMessages.ObserveSelfDeletionTimerSettingsForConversationUseCase
import com.wire.kalium.logic.feature.selfDeletingMessages.ObserveTeamSettingsSelfDeletingStatusUseCase
Expand Down Expand Up @@ -445,4 +446,11 @@ class UseCaseModule {
fun provideObserveIsAppLockEditableUseCase(
@KaliumCoreLogic coreLogic: CoreLogic
): ObserveIsAppLockEditableUseCase = coreLogic.getGlobalScope().observeIsAppLockEditableUseCase

@ViewModelScoped
@Provides
fun provideFetchConversationMLSVerificationStatusUseCase(
@KaliumCoreLogic coreLogic: CoreLogic,
@CurrentAccount currentAccount: UserId
): FetchConversationMLSVerificationStatusUseCase = coreLogic.getSessionScope(currentAccount).fetchConversationMLSVerificationStatus
}
9 changes: 9 additions & 0 deletions app/src/main/kotlin/com/wire/android/ui/home/conversations/info/ConversationInfoViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import com.wire.kalium.logic.data.id.QualifiedIdMapper
import com.wire.kalium.logic.data.user.ConnectionState
import com.wire.kalium.logic.data.user.UserId
import com.wire.kalium.logic.feature.conversation.ObserveConversationDetailsUseCase
import com.wire.kalium.logic.feature.e2ei.usecase.FetchConversationMLSVerificationStatusUseCase
import com.wire.kalium.logic.feature.user.GetSelfUserUseCase
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.first
Expand All @@ -52,6 +53,7 @@ class ConversationInfoViewModel @Inject constructor(
override val savedStateHandle: SavedStateHandle,
private val observeConversationDetails: ObserveConversationDetailsUseCase,
private val observerSelfUser: GetSelfUserUseCase,
private val fetchConversationMLSVerificationStatus: FetchConversationMLSVerificationStatusUseCase,
private val wireSessionImageLoader: WireSessionImageLoader,
) : SavedStateViewModel(savedStateHandle) {

Expand All @@ -64,6 +66,13 @@ class ConversationInfoViewModel @Inject constructor(

init {
getSelfUserId()
fetchMLSVerificationStatus()
}

private fun fetchMLSVerificationStatus() {
viewModelScope.launch {
fetchConversationMLSVerificationStatus(conversationId)
}
}

private fun getSelfUserId() {
Expand Down
6 changes: 6 additions & 0 deletions ...otlin/com/wire/android/ui/home/conversations/info/ConversationInfoViewModelArrangement.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import com.wire.kalium.logic.data.id.QualifiedID
import com.wire.kalium.logic.data.id.QualifiedIdMapper
import com.wire.kalium.logic.data.user.UserId
import com.wire.kalium.logic.feature.conversation.ObserveConversationDetailsUseCase
import com.wire.kalium.logic.feature.e2ei.usecase.FetchConversationMLSVerificationStatusUseCase
import com.wire.kalium.logic.feature.user.GetSelfUserUseCase
import io.mockk.MockKAnnotations
import io.mockk.coEvery
Expand Down Expand Up @@ -59,6 +60,9 @@ class ConversationInfoViewModelArrangement {
@MockK
lateinit var observerSelfUser: GetSelfUserUseCase

@MockK
lateinit var fetchConversationMLSVerificationStatus: FetchConversationMLSVerificationStatusUseCase

@MockK
private lateinit var wireSessionImageLoader: WireSessionImageLoader

Expand All @@ -71,6 +75,7 @@ class ConversationInfoViewModelArrangement {
savedStateHandle,
observeConversationDetails,
observerSelfUser,
fetchConversationMLSVerificationStatus,
wireSessionImageLoader
)
}
Expand All @@ -86,6 +91,7 @@ class ConversationInfoViewModelArrangement {
coEvery { observeConversationDetails(any()) } returns conversationDetailsChannel.consumeAsFlow().map {
ObserveConversationDetailsUseCase.Result.Success(it)
}
coEvery { fetchConversationMLSVerificationStatus.invoke(any()) } returns Unit
}

suspend fun withConversationDetailUpdate(conversationDetails: ConversationDetails) = apply {
Expand Down
2 changes: 1 addition & 1 deletion kalium
Open in desktop
Submodule kalium updated 11 files
+5 −187 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/e2ei/MLSConversationsVerificationStatusesHandler.kt
+17 −3 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+43 −0 ...mmonMain/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/FetchConversationMLSVerificationStatusUseCase.kt
+224 −0 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/FetchMLSVerificationStatusUseCase.kt
+3 −1 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/search/SearchUserResult.kt
+10 −303 ...onTest/kotlin/com/wire/kalium/logic/feature/conversation/MLSConversationsVerificationStatusesHandlerTest.kt
+98 −0 ...Test/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/FetchConversationMLSVerificationStatusUseCaseTest.kt
+348 −0 ...c/src/commonTest/kotlin/com/wire/kalium/logic/feature/e2ei/usecase/FetchMLSVerificationStatusUseCaseTest.kt
+8 −3 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/search/SearchByHandleUseCaseTest.kt
+8 −0 ...rc/commonTest/kotlin/com/wire/kalium/logic/util/arrangement/repository/ConversationRepositoryArrangement.kt
+43 −0 ...c/commonTest/kotlin/com/wire/kalium/logic/util/arrangement/usecase/FetchMLSVerificationStatusArrangement.kt
Loading