diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationListViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationListViewModel.kt index 9010ada16b..61e40af930 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationListViewModel.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/ConversationListViewModel.kt @@ -604,7 +604,8 @@ private fun ConversationDetails.toConversationItem( ), conversationInfo = ConversationInfo( name = otherUser?.name.orEmpty(), - membership = userTypeMapper.toMembership(userType) + membership = userTypeMapper.toMembership(userType), + isSenderUnavailable = otherUser?.isUnavailableUser ?: true ), lastMessageContent = UILastMessageContent.Connection( connection.status, diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/common/ConversationItemFactory.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/common/ConversationItemFactory.kt index 6f5636852a..6a4fe4bb7f 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/common/ConversationItemFactory.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/common/ConversationItemFactory.kt @@ -372,6 +372,25 @@ fun PreviewConnectionConversationItemWithSentConnectRequestBadge() { ) } +@Preview +@Composable +fun PreviewConnectionConversationItemWithSentConnectRequestBadgeWithUnknownSender() { + ConversationItemFactory( + conversation = ConversationItem.ConnectionConversation( + userAvatarData = UserAvatarData(), + conversationId = QualifiedID("value", "domain"), + mutedStatus = MutedConversationStatus.OnlyMentionsAndRepliesAllowed, + lastMessageContent = null, + badgeEventType = BadgeEventType.SentConnectRequest, + conversationInfo = ConversationInfo("", isSenderUnavailable = true) + ), + searchQuery = "", + isSelectableItem = false, + isChecked = false, + {}, {}, {}, {}, {}, {} + ) +} + @Preview @Composable fun PreviewPrivateConversationItemWithBlockedBadge() { diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/model/ConversationItem.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/model/ConversationItem.kt index dbae33d1b5..179d6ae12d 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/model/ConversationItem.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversationslist/model/ConversationItem.kt @@ -126,5 +126,6 @@ fun ConversationItem.ConnectionConversation.toUserInfoLabel() = UserInfoLabel( labelName = conversationInfo.name, isLegalHold = isLegalHold, - membership = conversationInfo.membership + membership = conversationInfo.membership, + unavailable = conversationInfo.isSenderUnavailable ) diff --git a/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt index 687dfcc435..3ef9320857 100644 --- a/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt +++ b/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt @@ -341,7 +341,7 @@ class DeviceDetailsViewModelTest { MockKAnnotations.init(this, relaxUnitFun = true) withFingerprintSuccess() coEvery { observeUserInfo(any()) } returns flowOf(GetUserInfoResult.Success(TestUser.OTHER_USER, null)) - coEvery { getE2eiCertificate(any()) } returns GetE2EICertificateUseCaseResult.Failure.NotActivated + coEvery { getE2eiCertificate(any()) } returns GetE2EICertificateUseCaseResult.NotActivated coEvery { isE2EIEnabledUseCase() } returns true } diff --git a/kalium b/kalium index 44d80621b1..a6c31af047 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 44d80621b1be9f7eaac5f78c175d978f5060a577 +Subproject commit a6c31af0472cf977a57004ac20d030371d13495c