Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Room lists: Remove shields on room avatars

Browse source 
#4115

but keep it in the room screen
This commit is contained in:
manuroe 2021-03-16 08:59:50 +01:00
parent e462ff9ad8
commit b88d15242d
7 changed files with 6 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.rst
View file

@ -6,6 +6,7 @@ Changes to be released in next version
🙌 Improvements 🙌 Improvements
* Pods: Update FlowCommoniOS, GBDeviceInfo, KeychainAccess, MatomoTracker, SwiftJWT, SwiftLint (#4120). * Pods: Update FlowCommoniOS, GBDeviceInfo, KeychainAccess, MatomoTracker, SwiftJWT, SwiftLint (#4120).
* Room lists: Remove shields on room avatars (#4115).
🐛 Bugfix 🐛 Bugfix
* *

1
Config/CommonConfiguration.swift
View file

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

38
Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
View file

@ -141,15 +141,7 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
self.directRoomBorderView.hidden = !roomCellData.roomSummary.room.isDirect; self.directRoomBorderView.hidden = !roomCellData.roomSummary.room.isDirect;
if (roomCellData.roomSummary.isEncrypted) self.encryptedRoomIcon.hidden = YES;
{
self.encryptedRoomIcon.hidden = NO;
self.encryptedRoomIcon.image = [self shieldImageForTrustLevel:roomCellData.roomSummary.roomEncryptionTrustLevel];
}
else
{
self.encryptedRoomIcon.hidden = YES;
}
[roomCellData.roomSummary setRoomAvatarImageIn:self.roomAvatar]; [roomCellData.roomSummary setRoomAvatarImageIn:self.roomAvatar];
} }
@ -165,32 +157,4 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
return 74; 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 @end

3
Riot/Modules/Contacts/Details/Views/RoomTableViewCell.m
View file

@ -66,8 +66,6 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
self.titleLabel.text = room.summary.displayname; self.titleLabel.text = room.summary.displayname;
self.directRoomBorderView.hidden = !room.isDirect; self.directRoomBorderView.hidden = !room.isDirect;
self.encryptedRoomIcon.hidden = !room.summary.isEncrypted;
} }
- (void)prepareForReuse - (void)prepareForReuse
@ -75,7 +73,6 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
[super prepareForReuse]; [super prepareForReuse];
self.directRoomBorderView.hidden = YES; self.directRoomBorderView.hidden = YES;
self.encryptedRoomIcon.hidden = YES;
} }
+ (CGFloat)cellHeight + (CGFloat)cellHeight

11
Riot/Modules/Home/Views/RoomCollectionViewCell.m
View file

@ -146,16 +146,7 @@ static const CGFloat kDirectRoomBorderWidth = 3.0;
} }
self.directRoomBorderView.hidden = !roomCellData.roomSummary.room.isDirect; self.directRoomBorderView.hidden = !roomCellData.roomSummary.room.isDirect;
self.encryptedRoomIcon.hidden = YES;
if (roomCellData.roomSummary.isEncrypted)
{
self.encryptedRoomIcon.hidden = NO;
self.encryptedRoomIcon.image = [EncryptionTrustLevelBadgeImageHelper roomBadgeImageFor:roomCellData.roomSummary.roomEncryptionTrustLevel];
}
else
{
self.encryptedRoomIcon.hidden = YES;
}
[roomCellData.roomSummary setRoomAvatarImageIn:self.roomAvatar]; [roomCellData.roomSummary setRoomAvatarImageIn:self.roomAvatar];
} }

2
Riot/Modules/Room/DataSources/RoomDataSource.m
View file

@ -120,6 +120,8 @@
if (self.room.summary.isEncrypted) if (self.room.summary.isEncrypted)
{ {
// Make sure we have the trust shield value
[self.room.summary enableTrustTracking:YES];
[self fetchEncryptionTrustedLevel]; [self fetchEncryptionTrustedLevel];
} }
} }

39
RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
View file

@ -70,16 +70,7 @@
} }
self.directRoomBorderView.hidden = !roomCellData.roomSummary.isDirect; self.directRoomBorderView.hidden = !roomCellData.roomSummary.isDirect;
self.encryptedRoomIcon.hidden = YES;
if (roomCellData.roomSummary.isEncrypted)
{
self.encryptedRoomIcon.hidden = NO;
self.encryptedRoomIcon.image = [self shieldImageForTrustLevel:roomCellData.roomSummary.roomEncryptionTrustLevel];
}
else
{
self.encryptedRoomIcon.hidden = YES;
}
} }
} }
@ -88,32 +79,4 @@
return 74; 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 @end