feat: Indicate user with valid E2EI certificate (WPB-3228)

app/src/main/kotlin/com/wire/android/di/accountScoped/UserModule.kt

@@ -27,6 +27,8 @@ import com.wire.kalium.logic.feature.asset.GetAvatarAssetUseCase
 import com.wire.kalium.logic.feature.conversation.GetAllContactsNotInConversationUseCase
 import com.wire.kalium.logic.feature.e2ei.usecase.EnrollE2EIUseCase
 import com.wire.kalium.logic.feature.e2ei.usecase.GetE2eiCertificateUseCase
+import com.wire.kalium.logic.feature.e2ei.usecase.GetMembersE2EICertificateStatusesUseCase
+import com.wire.kalium.logic.feature.e2ei.usecase.GetUserE2eiCertificateStatusUseCase
 import com.wire.kalium.logic.feature.publicuser.GetAllContactsUseCase
 import com.wire.kalium.logic.feature.publicuser.GetKnownUserUseCase
 import com.wire.kalium.logic.feature.publicuser.RefreshUsersWithoutMetadataUseCase
@@ -224,4 +226,14 @@ class UserModule {
     @Provides
     fun provideGetE2EICertificateUseCase(userScope: UserScope): GetE2eiCertificateUseCase =
         userScope.getE2EICertificate
+
+    @ViewModelScoped
+    @Provides
+    fun provideGetUserE2eiCertificateStatusUseCase(userScope: UserScope): GetUserE2eiCertificateStatusUseCase =
+        userScope.getUserE2eiCertificateStatus
+
+    @ViewModelScoped
+    @Provides
+    fun provideGetMembersE2EICertificateStatusesUseCase(userScope: UserScope): GetMembersE2EICertificateStatusesUseCase =
+        userScope.getMembersE2EICertificateStatuses
 }

app/src/main/kotlin/com/wire/android/mapper/UIParticipantMapper.kt

@@ -29,13 +29,14 @@ import com.wire.kalium.logic.data.user.OtherUser
 import com.wire.kalium.logic.data.user.SelfUser
 import com.wire.kalium.logic.data.user.User
 import com.wire.kalium.logic.data.user.type.UserType
+import com.wire.kalium.logic.feature.e2ei.CertificateStatus
 import javax.inject.Inject
 
 class UIParticipantMapper @Inject constructor(
     private val userTypeMapper: UserTypeMapper,
     private val wireSessionImageLoader: WireSessionImageLoader
 ) {
-    fun toUIParticipant(user: User): UIParticipant = with(user) {
+    fun toUIParticipant(user: User, mlsCertificateStatus: CertificateStatus? = null): UIParticipant = with(user) {
         val (userType, connectionState, unavailable) = when (this) {
             is OtherUser -> Triple(this.userType, this.connectionStatus, this.isUnavailableUser)
             // TODO(refactor): does self user need a type ? to false
@@ -55,6 +56,7 @@ class UIParticipantMapper @Inject constructor(
             botService = (user as? OtherUser)?.botService,
             isDefederated = (user is OtherUser && user.defederated),
             isProteusVerified = (user is OtherUser && user.isProteusVerified),
+            isMLSVerified = mlsCertificateStatus == CertificateStatus.VALID,
             supportedProtocolList = supportedProtocols.orEmpty().toList()
         )
     }

app/src/main/kotlin/com/wire/android/ui/home/conversations/details/participants/ConversationParticipantItem.kt

@@ -34,6 +34,7 @@ import com.wire.android.R
 import com.wire.android.model.Clickable
 import com.wire.android.model.UserAvatarData
 import com.wire.android.ui.common.ArrowRightIcon
+import com.wire.android.ui.common.MLSVerifiedIcon
 import com.wire.android.ui.common.ProteusVerifiedIcon
 import com.wire.android.ui.common.ProtocolLabel
 import com.wire.android.ui.common.RowItemTemplate
@@ -95,6 +96,7 @@ fun ConversationParticipantItem(
                     isDeleted = uiParticipant.isDeleted
                 )
 
+                if (uiParticipant.isMLSVerified) MLSVerifiedIcon()
                 if (uiParticipant.isProteusVerified) ProteusVerifiedIcon()
                 if (BuildConfig.MLS_SUPPORT_ENABLED && BuildConfig.DEVELOPER_FEATURES_ENABLED) {
                     uiParticipant.supportedProtocolList.map {
@@ -144,6 +146,7 @@ fun PreviewGroupConversationParticipantItem() {
             false,
             UserAvatarData(),
             Membership.Guest,
+            isMLSVerified = true,
             isProteusVerified = true,
             supportedProtocolList = listOf(SupportedProtocol.PROTEUS, SupportedProtocol.MLS)),
         clickable = Clickable(enabled = true) {}

app/src/main/kotlin/com/wire/android/ui/home/conversations/details/participants/model/UIParticipant.kt

@@ -41,5 +41,6 @@ data class UIParticipant(
     val botService: BotService? = null,
     val isDefederated: Boolean = false,
     val isProteusVerified: Boolean = false,
+    val isMLSVerified: Boolean = false,
     val supportedProtocolList: List<SupportedProtocol> = listOf()
 )

app/src/main/kotlin/com/wire/android/ui/home/conversations/details/participants/usecase/ObserveParticipantsForConversationUseCase.kt

@@ -21,20 +21,23 @@ package com.wire.android.ui.home.conversations.details.participants.usecase
 import com.wire.android.mapper.UIParticipantMapper
 import com.wire.android.ui.home.conversations.details.participants.model.ConversationParticipantsData
 import com.wire.android.ui.home.conversations.name
+import com.wire.android.ui.home.conversations.userId
 import com.wire.android.util.dispatchers.DispatcherProvider
 import com.wire.kalium.logic.data.conversation.Conversation.Member
 import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.data.user.OtherUser
 import com.wire.kalium.logic.data.user.SelfUser
 import com.wire.kalium.logic.data.user.type.UserType
 import com.wire.kalium.logic.feature.conversation.ObserveConversationMembersUseCase
+import com.wire.kalium.logic.feature.e2ei.usecase.GetMembersE2EICertificateStatusesUseCase
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 class ObserveParticipantsForConversationUseCase @Inject constructor(
     private val observeConversationMembers: ObserveConversationMembersUseCase,
+    private val getMembersE2EICertificateStatuses: GetMembersE2EICertificateStatusesUseCase,
     private val uiParticipantMapper: UIParticipantMapper,
     private val dispatchers: DispatcherProvider
 ) {
@@ -47,13 +50,21 @@ class ObserveParticipantsForConversationUseCase @Inject constructor(
                     isAdmin && !isService
                 }
             }
-
             .map { sortedMemberList ->
                 val allAdminsWithoutServices = sortedMemberList.getOrDefault(true, listOf())
+                val visibleAdminsWithoutServices = allAdminsWithoutServices.limit(limit)
                 val allParticipants = sortedMemberList.getOrDefault(false, listOf())
+                val visibleParticipants = allParticipants.limit(limit)
+
+                val visibleUserIds = visibleParticipants.map { it.userId }
+                    .plus(visibleAdminsWithoutServices.map { it.userId })
+
+                val mlsVerificationMap = getMembersE2EICertificateStatuses(conversationId, visibleUserIds)
                 ConversationParticipantsData(
-                    admins = allAdminsWithoutServices.limit(limit).map { uiParticipantMapper.toUIParticipant(it.user) },
-                    participants = allParticipants.limit(limit).map { uiParticipantMapper.toUIParticipant(it.user) },
+                    admins = visibleAdminsWithoutServices
+                        .map { uiParticipantMapper.toUIParticipant(it.user, mlsVerificationMap[it.user.id]) },
+                    participants = visibleParticipants
+                        .map { uiParticipantMapper.toUIParticipant(it.user, mlsVerificationMap[it.user.id]) },
                     allAdminsCount = allAdminsWithoutServices.size,
                     allParticipantsCount = allParticipants.size,
                     isSelfAnAdmin = allAdminsWithoutServices.any { it.user is SelfUser }

app/src/main/kotlin/com/wire/android/ui/userprofile/common/UserProfileInfo.kt

@@ -54,6 +54,7 @@ import com.wire.android.model.Clickable
 import com.wire.android.model.ImageAsset.UserAvatarAsset
 import com.wire.android.model.UserAvatarData
 import com.wire.android.ui.common.Icon
+import com.wire.android.ui.common.MLSVerifiedIcon
 import com.wire.android.ui.common.ProteusVerifiedIcon
 import com.wire.android.ui.common.UserBadge
 import com.wire.android.ui.common.UserProfileAvatar
@@ -89,6 +90,7 @@ fun UserProfileInfo(
     connection: ConnectionState = ConnectionState.ACCEPTED,
     delayToShowPlaceholderIfNoAsset: Duration = 200.milliseconds,
     isProteusVerified: Boolean = false,
+    isMLSVerified: Boolean = false,
     onSearchConversationMessagesClick: () -> Unit = {},
     onConversationMediaClick: () -> Unit = {},
     shouldShowSearchButton: Boolean = false
@@ -181,6 +183,7 @@ fun UserProfileInfo(
                         else MaterialTheme.wireColorScheme.labelText
                     )
 
+                    if (isMLSVerified) MLSVerifiedIcon()
                     if (isProteusVerified) ProteusVerifiedIcon()
                 }
                 Text(
@@ -280,6 +283,7 @@ fun PreviewUserProfileInfo() {
         onUserProfileClick = {},
         teamName = "Wire",
         connection = ConnectionState.ACCEPTED,
-        isProteusVerified = true
+        isProteusVerified = true,
+        isMLSVerified = true
     )
 }

app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreen.kt

@@ -402,6 +402,7 @@ private fun TopBarCollapsing(
             modifier = Modifier.padding(bottom = dimensions().spacing16x),
             connection = targetState.connectionState,
             isProteusVerified = targetState.isProteusVerified,
+            isMLSVerified = targetState.isMLSVerified,
             onSearchConversationMessagesClick = onSearchConversationMessagesClick,
             shouldShowSearchButton = state.shouldShowSearchButton(),
             onConversationMediaClick = onConversationMediaClick

app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreenViewModel.kt

@@ -68,6 +68,9 @@ import com.wire.kalium.logic.feature.conversation.UpdateConversationArchivedStat
 import com.wire.kalium.logic.feature.conversation.UpdateConversationMemberRoleResult
 import com.wire.kalium.logic.feature.conversation.UpdateConversationMemberRoleUseCase
 import com.wire.kalium.logic.feature.conversation.UpdateConversationMutedStatusUseCase
+import com.wire.kalium.logic.feature.e2ei.CertificateStatus
+import com.wire.kalium.logic.feature.e2ei.usecase.GetUserE2eiCertificateStatusResult
+import com.wire.kalium.logic.feature.e2ei.usecase.GetUserE2eiCertificateStatusUseCase
 import com.wire.kalium.logic.feature.user.GetUserInfoResult
 import com.wire.kalium.logic.feature.user.ObserveUserInfoUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -101,6 +104,7 @@ class OtherUserProfileScreenViewModel @Inject constructor(
     private val fetchUsersClients: FetchUsersClientsFromRemoteUseCase,
     private val clearConversationContentUseCase: ClearConversationContentUseCase,
     private val updateConversationArchivedStatus: UpdateConversationArchivedStatusUseCase,
+    private val getUserE2eiCertificateStatus: GetUserE2eiCertificateStatusUseCase,
     savedStateHandle: SavedStateHandle
 ) : ViewModel(), OtherUserProfileEventsHandler, OtherUserProfileBottomSheetEventsHandler {
 
@@ -127,6 +131,16 @@ class OtherUserProfileScreenViewModel @Inject constructor(
     init {
         observeUserInfoAndUpdateViewState()
         persistClients()
+        getMLSVerificationStatus()
+    }
+
+    private fun getMLSVerificationStatus() {
+        viewModelScope.launch(dispatchers.io()) {
+            val isMLSVerified = getUserE2eiCertificateStatus(userId).let {
+                it is GetUserE2eiCertificateStatusResult.Success && it.status == CertificateStatus.VALID
+            }
+            state = state.copy(isMLSVerified = isMLSVerified)
+        }
     }
 
     override fun observeClientList() {

app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileState.kt

@@ -48,7 +48,8 @@ data class OtherUserProfileState(
     val conversationSheetContent: ConversationSheetContent? = null,
     val otherUserDevices: List<Device> = listOf(),
     val blockingState: BlockingState = BlockingState.CAN_NOT_BE_BLOCKED,
-    val isProteusVerified: Boolean = false
+    val isProteusVerified: Boolean = false,
+    val isMLSVerified: Boolean = false
 ) {
     fun updateMuteStatus(status: MutedConversationStatus): OtherUserProfileState {
         return conversationSheetContent?.let {

app/src/test/kotlin/com/wire/android/ui/home/conversations/details/participants/usecase/ObserveParticipantsForConversationUseCaseTest.kt

@@ -29,6 +29,7 @@ import com.wire.kalium.logic.data.conversation.MemberDetails
 import com.wire.kalium.logic.data.id.ConversationId
 import com.wire.kalium.logic.data.user.type.UserType
 import com.wire.kalium.logic.feature.conversation.ObserveConversationMembersUseCase
+import com.wire.kalium.logic.feature.e2ei.usecase.GetMembersE2EICertificateStatusesUseCase
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
 import io.mockk.impl.annotations.MockK
@@ -37,13 +38,14 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.consumeAsFlow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.internal.assertEquals
 import org.junit.jupiter.api.Test
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class ObserveParticipantsForConversationUseCaseTest {
 
     @Test
-    fun `given a group members, when solving the participants list with limit, then limited sizes are passed`() = runTest {
+    fun givenGroupMembers_whenSolvingTheParticipantsListWithLimit_thenLimitedSizesArePassed() = runTest {
         // Given
         val limit = 4
         val members = buildList {
@@ -57,13 +59,13 @@ class ObserveParticipantsForConversationUseCaseTest {
         // When - Then
         useCase(ConversationId("", ""), limit).test {
             val data = awaitItem()
-            assert(data.participants.size == limit)
-            assert(data.allParticipantsCount == members.size)
+            assertEquals(limit, data.participants.size)
+            assertEquals(members.size, data.allParticipantsCount)
         }
     }
 
     @Test
-    fun `given a group members, when solving the participants list without limit, then all lists are passed`() = runTest {
+    fun givenGroupMembers_whenSolvingTheParticipantsListWithoutLimit_thenAllListsArePassed() = runTest {
         // Given
         val members: List<MemberDetails> = buildList {
             for (i in 1..20) {
@@ -86,13 +88,18 @@ internal class ObserveParticipantsForConversationUseCaseArrangement {
 
     @MockK
     lateinit var observeConversationMembersUseCase: ObserveConversationMembersUseCase
+
+    @MockK
+    lateinit var getMembersE2EICertificateStatuses: GetMembersE2EICertificateStatusesUseCase
+
     @MockK
     private lateinit var wireSessionImageLoader: WireSessionImageLoader
     private val uIParticipantMapper by lazy { UIParticipantMapper(UserTypeMapper(), wireSessionImageLoader) }
     private val conversationMembersChannel = Channel<List<MemberDetails>>(capacity = Channel.UNLIMITED)
     private val useCase by lazy {
         ObserveParticipantsForConversationUseCase(
             observeConversationMembersUseCase,
+            getMembersE2EICertificateStatuses,
             uIParticipantMapper,
             dispatchers = TestDispatcherProvider()
         )
@@ -103,6 +110,7 @@ internal class ObserveParticipantsForConversationUseCaseArrangement {
         MockKAnnotations.init(this, relaxUnitFun = true)
         // Default empty values
         coEvery { observeConversationMembersUseCase(any()) } returns flowOf()
+        coEvery { getMembersE2EICertificateStatuses(any(), any()) } returns mapOf()
     }
 
     suspend fun withConversationParticipantsUpdate(members: List<MemberDetails>): ObserveParticipantsForConversationUseCaseArrangement {

app/src/test/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileViewModelArrangement.kt

@@ -43,6 +43,9 @@ import com.wire.kalium.logic.feature.conversation.UpdateConversationArchivedStat
 import com.wire.kalium.logic.feature.conversation.UpdateConversationMemberRoleResult
 import com.wire.kalium.logic.feature.conversation.UpdateConversationMemberRoleUseCase
 import com.wire.kalium.logic.feature.conversation.UpdateConversationMutedStatusUseCase
+import com.wire.kalium.logic.feature.e2ei.CertificateStatus
+import com.wire.kalium.logic.feature.e2ei.usecase.GetUserE2eiCertificateStatusResult
+import com.wire.kalium.logic.feature.e2ei.usecase.GetUserE2eiCertificateStatusUseCase
 import com.wire.kalium.logic.feature.user.GetSelfUserUseCase
 import com.wire.kalium.logic.feature.user.GetUserInfoResult
 import com.wire.kalium.logic.feature.user.ObserveUserInfoUseCase
@@ -102,6 +105,9 @@ internal class OtherUserProfileViewModelArrangement {
     @MockK
     lateinit var updateConversationArchivedStatus: UpdateConversationArchivedStatusUseCase
 
+    @MockK
+    lateinit var getUserE2eiCertificateStatus: GetUserE2eiCertificateStatusUseCase
+
     private val viewModel by lazy {
         OtherUserProfileScreenViewModel(
             TestDispatcherProvider(),
@@ -119,6 +125,7 @@ internal class OtherUserProfileViewModelArrangement {
             fetchUsersClientsFromRemote,
             clearConversationContent,
             updateConversationArchivedStatus,
+            getUserE2eiCertificateStatus,
             savedStateHandle
         )
     }
@@ -147,6 +154,7 @@ internal class OtherUserProfileViewModelArrangement {
         coEvery { getOneToOneConversation(USER_ID) } returns flowOf(
             GetOneToOneConversationUseCase.Result.Success(OtherUserProfileScreenViewModelTest.CONVERSATION)
         )
+        coEvery { getUserE2eiCertificateStatus.invoke(any()) } returns GetUserE2eiCertificateStatusResult.Success(CertificateStatus.VALID)
     }
 
     suspend fun withBlockUserResult(result: BlockUserResult) = apply {