Skip to content

fix: e2ei identity certificate status (WPB-20235) #4565

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

Open
sbakhtiarov wants to merge 1 commit into
base: develop
Choose a base branch
from
+13 −5
Open

fix: e2ei identity certificate status (WPB-20235) #4565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/src/main/kotlin/com/wire/android/ui/authentication/devices/DeviceItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ private fun ColumnScope.DeviceItemTexts(
.then(semantic)
)
if (shouldShowVerifyLabel) {
if (shouldShowE2EIInfo) {
MLSVerificationIcon(device.mlsClientIdentity?.e2eiStatus)
if (shouldShowE2EIInfo && device.mlsClientIdentity != null) {
MLSVerificationIcon(device.mlsClientIdentity.e2eiStatus)
}
if (device.isVerifiedProteus && !isCurrentClient) {
ProteusVerifiedIcon(
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ fun DeviceDetailsContent(
}
}

if (state.isE2EIEnabled) {
if (state.isE2EIEnabled && state.isE2eiCertificateDataAvailable) {
item {
EndToEndIdentityCertificateItem(
isE2eiCertificateActivated = state.isE2eiCertificateActivated,
Expand Down Expand Up @@ -363,8 +363,8 @@ private fun DeviceDetailsTopBar(
maxLines = 2
)

if (shouldShowE2EIInfo) {
MLSVerificationIcon(device.mlsClientIdentity?.e2eiStatus)
if (shouldShowE2EIInfo && device.mlsClientIdentity != null) {
MLSVerificationIcon(device.mlsClientIdentity.e2eiStatus)
}

if (!isCurrentDevice && device.isVerifiedProteus) {
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,13 @@ class DeviceDetailsViewModel @Inject constructor(
private fun getE2eiCertificate() {
viewModelScope.launch {
state = when (val result = mlsClientIdentity(deviceId)) {
is GetMLSClientIdentityResult.Failure.E2EINotAvailable -> {
state.copy(
isE2eiCertificateActivated = false,
isLoadingCertificate = false,
isE2eiCertificateDataAvailable = false
)
}
is GetMLSClientIdentityResult.Failure -> {
state.copy(isE2eiCertificateActivated = false, isLoadingCertificate = false)
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/kotlin/com/wire/android/ui/settings/devices/model/DeviceDetailsState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@ data class DeviceDetailsState(
val startGettingE2EICertificate: Boolean = false,
val mlsCipherSuiteSignature: String? = null,
val deviceRemoved: Boolean = false,
val isE2eiCertificateDataAvailable: Boolean = true,
)
Loading