Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Badges: Make Riot build again #3133

Merged
merged 1 commit into from
Apr 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Riot/Categories/MXRoom+Riot.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
Get user encryption trust level.

@param userId The user id.
@param onComplete the block providing the trust level.
*/
- (UserEncryptionTrustLevel)encryptionTrustLevelForUserId:(NSString*)userId;
- (void)encryptionTrustLevelForUserId:(NSString*)userId onComplete:(void (^)(UserEncryptionTrustLevel userEncryptionTrustLevel))onComplete;

@end
47 changes: 24 additions & 23 deletions Riot/Categories/MXRoom+Riot.m
Original file line number Diff line number Diff line change
Expand Up @@ -324,35 +324,36 @@ - (void)allMessages:(void (^)(void))completion
}
}

- (UserEncryptionTrustLevel)encryptionTrustLevelForUserId:(NSString*)userId
- (void)encryptionTrustLevelForUserId:(NSString*)userId onComplete:(void (^)(UserEncryptionTrustLevel userEncryptionTrustLevel))onComplete
{
UserEncryptionTrustLevel userEncryptionTrustLevel;

if (self.mxSession.crypto)
if (self.mxSession.crypto)
{
MXUsersTrustLevelSummary *usersTrustLevelSummary = [self.mxSession.crypto trustLevelSummaryForUserIds:@[userId]];

double trustedDevicesPercentage = usersTrustLevelSummary.trustedDevicesProgress.fractionCompleted;

if (trustedDevicesPercentage >= 1.0)
{
userEncryptionTrustLevel = UserEncryptionTrustLevelTrusted;
}
else if (trustedDevicesPercentage == 0.0)
{
userEncryptionTrustLevel = UserEncryptionTrustLevelNormal;
}
else
{
userEncryptionTrustLevel = UserEncryptionTrustLevelWarning;
}
[self.mxSession.crypto trustLevelSummaryForUserIds:@[userId] onComplete:^(MXUsersTrustLevelSummary *usersTrustLevelSummary) {

UserEncryptionTrustLevel userEncryptionTrustLevel;
double trustedDevicesPercentage = usersTrustLevelSummary.trustedDevicesProgress.fractionCompleted;

if (trustedDevicesPercentage >= 1.0)
{
userEncryptionTrustLevel = UserEncryptionTrustLevelTrusted;
}
else if (trustedDevicesPercentage == 0.0)
{
userEncryptionTrustLevel = UserEncryptionTrustLevelNormal;
}
else
{
userEncryptionTrustLevel = UserEncryptionTrustLevelWarning;
}

onComplete(userEncryptionTrustLevel);

}];
}
else
{
userEncryptionTrustLevel = UserEncryptionTrustLevelNone;
onComplete(UserEncryptionTrustLevelNone);
}

return userEncryptionTrustLevel;
}

#pragma mark -
Expand Down
13 changes: 7 additions & 6 deletions Riot/Modules/Contacts/Views/ContactTableViewCell.m
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,16 @@ - (void)refreshContactThumbnail
- (void)refreshContactBadgeImage
{
NSString *matrixId = [self firstMatrixId];

UserEncryptionTrustLevel userEncryptionTrustLevel = UserEncryptionTrustLevelUnknown;

if (matrixId)
{
userEncryptionTrustLevel = [self.mxRoom encryptionTrustLevelForUserId:matrixId];
[self.mxRoom encryptionTrustLevelForUserId:matrixId onComplete:^(UserEncryptionTrustLevel userEncryptionTrustLevel) {
self.avatarBadgeImageView.image = [EncryptionTrustLevelBadgeImageHelper userBadgeImageFor:userEncryptionTrustLevel];
}];
}
else
{
self.avatarBadgeImageView.image = [EncryptionTrustLevelBadgeImageHelper userBadgeImageFor:UserEncryptionTrustLevelUnknown];
}

self.avatarBadgeImageView.image = [EncryptionTrustLevelBadgeImageHelper userBadgeImageFor:userEncryptionTrustLevel];
}

- (void)refreshContactDisplayName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,10 @@ - (void)refreshUserEncryptionTrustLevel
return;
}

self.encryptionTrustLevel = [self.mxRoom encryptionTrustLevelForUserId:userId];
[self updateMemberInfo];
[self.mxRoom encryptionTrustLevelForUserId:userId onComplete:^(UserEncryptionTrustLevel userEncryptionTrustLevel) {
self.encryptionTrustLevel = userEncryptionTrustLevel;
[self updateMemberInfo];
}];
}

- (BOOL)isRoomMemberCurrentUser
Expand Down