From 01bce5658b5594d55d2f37b985e408bc4f75b902 Mon Sep 17 00:00:00 2001 From: Onuray Sahin Date: Fri, 26 Aug 2022 12:53:30 +0300 Subject: [PATCH] Calculate trust level for shield in viewmodel. --- .../settings/devices/DevicesViewModel.kt | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt index 1840a97098..11fc6ecd64 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt @@ -57,6 +57,7 @@ import org.matrix.android.sdk.api.session.Session import org.matrix.android.sdk.api.session.crypto.crosssigning.DeviceTrustLevel import org.matrix.android.sdk.api.session.crypto.model.CryptoDeviceInfo import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo +import org.matrix.android.sdk.api.session.crypto.model.RoomEncryptionTrustLevel import org.matrix.android.sdk.api.session.crypto.verification.VerificationMethod import org.matrix.android.sdk.api.session.crypto.verification.VerificationService import org.matrix.android.sdk.api.session.crypto.verification.VerificationTransaction @@ -79,12 +80,13 @@ data class DevicesViewState( // TODO Replace by isLoading boolean val request: Async = Uninitialized, val hasAccountCrossSigning: Boolean = false, - val accountCrossSigningIsTrusted: Boolean = false + val accountCrossSigningIsTrusted: Boolean = false, ) : MavericksState data class DeviceFullInfo( val deviceInfo: DeviceInfo, - val cryptoDeviceInfo: CryptoDeviceInfo? + val cryptoDeviceInfo: CryptoDeviceInfo?, + val trustLevelForShield: RoomEncryptionTrustLevel, ) class DevicesViewModel @AssistedInject constructor( @@ -108,11 +110,13 @@ class DevicesViewModel @AssistedInject constructor( private val refreshSource = PublishDataSource() init { + val hasAccountCrossSigning = session.cryptoService().crossSigningService().isCrossSigningInitialized() + val accountCrossSigningIsTrusted = session.cryptoService().crossSigningService().isCrossSigningVerified() setState { copy( - hasAccountCrossSigning = session.cryptoService().crossSigningService().isCrossSigningInitialized(), - accountCrossSigningIsTrusted = session.cryptoService().crossSigningService().isCrossSigningVerified(), + hasAccountCrossSigning = hasAccountCrossSigning, + accountCrossSigningIsTrusted = accountCrossSigningIsTrusted, myDeviceId = session.sessionParams.deviceId ?: "" ) } @@ -125,7 +129,13 @@ class DevicesViewModel @AssistedInject constructor( .sortedByDescending { it.lastSeenTs } .map { deviceInfo -> val cryptoDeviceInfo = cryptoList.firstOrNull { it.deviceId == deviceInfo.deviceId } - DeviceFullInfo(deviceInfo, cryptoDeviceInfo) + val trustLevelForShield = computeTrustLevelForShield( + currentSessionCrossTrusted = accountCrossSigningIsTrusted, + legacyMode = !hasAccountCrossSigning, + deviceTrustLevel = cryptoDeviceInfo?.trustLevel, + isCurrentDevice = deviceInfo.deviceId == session.sessionParams.deviceId + ) + DeviceFullInfo(deviceInfo, cryptoDeviceInfo, trustLevelForShield) } } .distinctUntilChanged() @@ -243,6 +253,20 @@ class DevicesViewModel @AssistedInject constructor( } } + private fun computeTrustLevelForShield( + currentSessionCrossTrusted: Boolean, + legacyMode: Boolean, + deviceTrustLevel: DeviceTrustLevel?, + isCurrentDevice: Boolean, + ): RoomEncryptionTrustLevel { + return TrustUtils.shieldForTrust( + currentDevice = isCurrentDevice, + trustMSK = currentSessionCrossTrusted, + legacyMode = legacyMode, + deviceTrustLevel = deviceTrustLevel + ) + } + private fun handleInteractiveVerification(action: DevicesAction.VerifyMyDevice) { val txID = session.cryptoService() .verificationService()