From 7f93dc68b736b5e6b93e4d636ad717499fff7006 Mon Sep 17 00:00:00 2001 From: manuroe Date: Sat, 1 Feb 2020 17:25:23 +0100 Subject: [PATCH] Room e2e decoration: Change the algo a bit --- Riot/Categories/MXRoomSummary+Riot.m | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Riot/Categories/MXRoomSummary+Riot.m b/Riot/Categories/MXRoomSummary+Riot.m index fb13dccc4..688f9d2c8 100644 --- a/Riot/Categories/MXRoomSummary+Riot.m +++ b/Riot/Categories/MXRoomSummary+Riot.m @@ -52,22 +52,25 @@ RoomEncryptionTrustLevel roomEncryptionTrustLevel = RoomEncryptionTrustLevelUnknown; if (self.trust) { + double trustedUsersPercentage = self.trust.trustedUsersProgress.fractionCompleted; double trustedDevicesPercentage = self.trust.trustedDevicesProgress.fractionCompleted; - - if (trustedDevicesPercentage >= 1.0 - || self.trust.trustedDevicesProgress.totalUnitCount == 0) + + if (trustedUsersPercentage >= 1.0) { - roomEncryptionTrustLevel = RoomEncryptionTrustLevelTrusted; - } - else if (trustedDevicesPercentage == 0.0) - { - roomEncryptionTrustLevel = RoomEncryptionTrustLevelNormal; + if (trustedDevicesPercentage >= 1.0) + { + roomEncryptionTrustLevel = RoomEncryptionTrustLevelTrusted; + } + else + { + roomEncryptionTrustLevel = RoomEncryptionTrustLevelWarning; + } } else { - roomEncryptionTrustLevel = RoomEncryptionTrustLevelWarning; + roomEncryptionTrustLevel = RoomEncryptionTrustLevelNormal; } - + roomEncryptionTrustLevel = roomEncryptionTrustLevel; }