Room lists: Remove shields on room avatars

#4115 but keep it in the room screen
element-hq · Mar 17, 2021 · b88d152 · b88d152
1 parent e462ff9
commit b88d152
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 89 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -6,6 +6,7 @@ Changes to be released in next version
 
 🙌 Improvements
  * Pods: Update FlowCommoniOS, GBDeviceInfo, KeychainAccess, MatomoTracker, SwiftJWT, SwiftLint (#4120).
+ * Room lists: Remove shields on room avatars (#4115).
 
 🐛 Bugfix
  * 

diff --git a/Config/CommonConfiguration.swift b/Config/CommonConfiguration.swift
@@ -59,7 +59,6 @@ class CommonConfiguration: NSObject, Configurable {
 
  // Enable e2e encryption for newly created MXSession
  sdkOptions.enableCryptoWhenStartingMXSession = true
- sdkOptions.computeE2ERoomSummaryTrust = true
 
  // Disable identicon use
  sdkOptions.disableIdenticonUseForUserAvatar = true

diff --git a/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m b/Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
@@ -141,15 +141,7 @@ - (void)render:(MXKCellData *)cellData
 
  self.directRoomBorderView.hidden = !roomCellData.roomSummary.room.isDirect;
 
- if (roomCellData.roomSummary.isEncrypted)
- {
- self.encryptedRoomIcon.hidden = NO;
- self.encryptedRoomIcon.image = [self shieldImageForTrustLevel:roomCellData.roomSummary.roomEncryptionTrustLevel];
- }
- else
- {
- self.encryptedRoomIcon.hidden = YES;
- }
+ self.encryptedRoomIcon.hidden = YES;
 
  [roomCellData.roomSummary setRoomAvatarImageIn:self.roomAvatar];
  }
@@ -165,32 +157,4 @@ + (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)m
  return 74;
 }
 
-- (UIImage*)shieldImageForTrustLevel:(RoomEncryptionTrustLevel)roomEncryptionTrustLevel
-{
- UIImage *shieldImage;
-
- NSString *encryptionIconName;
- switch (roomEncryptionTrustLevel)
- {
- case RoomEncryptionTrustLevelWarning:
- encryptionIconName = @"encryption_warning";
- break;
- case RoomEncryptionTrustLevelNormal:
- encryptionIconName = @"encryption_normal";
- break;
- case RoomEncryptionTrustLevelTrusted:
- encryptionIconName = @"encryption_trusted";
- break;
- case RoomEncryptionTrustLevelUnknown:
- encryptionIconName = @"encryption_normal";
- break;
- }
-
- if (encryptionIconName)
- {
- shieldImage = [UIImage imageNamed:encryptionIconName];
- }
- return shieldImage;
-}
-
 @end
diff --git a/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m b/Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m
@@ -66,16 +66,13 @@ - (void)render:(MXRoom *)room
  self.titleLabel.text = room.summary.displayname;
 
  self.directRoomBorderView.hidden = !room.isDirect;
-
- self.encryptedRoomIcon.hidden = !room.summary.isEncrypted;
 }
 
 - (void)prepareForReuse
 {
  [super prepareForReuse];
 
  self.directRoomBorderView.hidden = YES;
- self.encryptedRoomIcon.hidden = YES;
 }
 
 + (CGFloat)cellHeight

diff --git a/Riot/Modules/Home/Views/RoomCollectionViewCell.m b/Riot/Modules/Home/Views/RoomCollectionViewCell.m
@@ -146,16 +146,7 @@ - (void)render:(MXKCellData *)cellData
  }
 
  self.directRoomBorderView.hidden = !roomCellData.roomSummary.room.isDirect;
-
- if (roomCellData.roomSummary.isEncrypted)
- {
- self.encryptedRoomIcon.hidden = NO;
- self.encryptedRoomIcon.image = [EncryptionTrustLevelBadgeImageHelper roomBadgeImageFor:roomCellData.roomSummary.roomEncryptionTrustLevel];
- }
- else
- {
- self.encryptedRoomIcon.hidden = YES;
- }
+ self.encryptedRoomIcon.hidden = YES;
 
  [roomCellData.roomSummary setRoomAvatarImageIn:self.roomAvatar];
  }

diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -120,6 +120,8 @@ - (void)finalizeInitialization
 
  if (self.room.summary.isEncrypted)
  {
+ // Make sure we have the trust shield value
+ [self.room.summary enableTrustTracking:YES];
  [self fetchEncryptionTrustedLevel];
  }
 }

diff --git a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
@@ -70,16 +70,7 @@ - (void)render:(MXKCellData *)cellData
  } 
 
  self.directRoomBorderView.hidden = !roomCellData.roomSummary.isDirect;
-
- if (roomCellData.roomSummary.isEncrypted)
- {
- self.encryptedRoomIcon.hidden = NO;
- self.encryptedRoomIcon.image = [self shieldImageForTrustLevel:roomCellData.roomSummary.roomEncryptionTrustLevel];
- }
- else
- {
- self.encryptedRoomIcon.hidden = YES;
- }
+ self.encryptedRoomIcon.hidden = YES;
  }
 }
 
@@ -88,32 +79,4 @@ + (CGFloat)cellHeight
  return 74;
 }
 
-- (UIImage*)shieldImageForTrustLevel:(RoomEncryptionTrustLevel)roomEncryptionTrustLevel
-{
- UIImage *shieldImage;
-
- NSString *encryptionIconName;
- switch (roomEncryptionTrustLevel)
- {
- case RoomEncryptionTrustLevelWarning:
- encryptionIconName = @"encryption_warning";
- break;
- case RoomEncryptionTrustLevelNormal:
- encryptionIconName = @"encryption_normal";
- break;
- case RoomEncryptionTrustLevelTrusted:
- encryptionIconName = @"encryption_trusted";
- break;
- case RoomEncryptionTrustLevelUnknown:
- encryptionIconName = @"encryption_normal";
- break;
- }
-
- if (encryptionIconName)
- {
- shieldImage = [UIImage imageNamed:encryptionIconName];
- }
- return shieldImage;
-}
-
 @end