From 1d22fb47ca03447e71a71abfb8e38f742fc17a44 Mon Sep 17 00:00:00 2001 From: Yamil Medina Date: Fri, 27 Dec 2024 08:05:14 -0300 Subject: [PATCH] fix: adjustments for short signature names (WPB-15188) (#3768) --- .../ui/settings/devices/DeviceDetailsViewModel.kt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModel.kt index 1ca4096174..241cafd5fa 100644 --- a/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModel.kt +++ b/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModel.kt @@ -201,7 +201,7 @@ class DeviceDetailsViewModel @Inject constructor( canBeRemoved = !result.isCurrentClient && isSelfClient && result.client.type != ClientType.LegalHold, mlsCipherSuiteSignature = MLSPublicKeyType.from( result.client.mlsPublicKeys?.keys?.firstOrNull().orEmpty() - ).value.toString() + ).let { mapCipherSuiteSignatureToShortName(it) } ) } } @@ -209,6 +209,17 @@ class DeviceDetailsViewModel @Inject constructor( } } + private fun mapCipherSuiteSignatureToShortName(signature: MLSPublicKeyType): String { + return when (signature) { + MLSPublicKeyType.ECDSA_SECP256R1_SHA256 -> "P256" + MLSPublicKeyType.ECDSA_SECP384R1_SHA384 -> "P384" + MLSPublicKeyType.ECDSA_SECP521R1_SHA512 -> "P521" + MLSPublicKeyType.ED25519 -> "ED25519" + MLSPublicKeyType.ED448 -> "ED448" + is MLSPublicKeyType.Unknown -> "Unknown" + } + } + fun removeDevice(onSuccess: () -> Unit) { viewModelScope.launch { val isPasswordRequired: Boolean = when (val passwordRequiredResult = isPasswordRequired()) {