felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-20 00:24:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into riot_3138

Browse Source
This commit is contained in:
manuroe
2020-04-23 15:53:15 +02:00
committed by GitHub
parent 835bd8e3dc 81167b6069
commit c4ad65bb12
13 changed files with 79 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
+23 -2
View File
@@ -493,6 +493,11 @@
self.userVerificationCoordinatorBridgePresenter = userVerificationCoordinatorBridgePresenter;
}
- (void)presentCompleteSecurity
{
[[AppDelegate theDelegate] presentCompleteSecurityForSession:self.mainSession];
}
#pragma mark - Hide/Show navigation bar border
- (void)hideNavigationBarBorder:(BOOL)isHidden
@@ -843,7 +848,16 @@
break;
case UserEncryptionTrustLevelNotVerified:
case UserEncryptionTrustLevelNoCrossSigning:
statusText = NSLocalizedStringFromTable(@"room_participants_action_security_status_verify", @"Vector", nil);
{
if (self.isRoomMemberCurrentUser)
{
statusText = NSLocalizedStringFromTable(@"room_participants_action_security_status_complete_security", @"Vector", nil);
}
else
{
statusText = NSLocalizedStringFromTable(@"room_participants_action_security_status_verify", @"Vector", nil);
}
}
break;
case UserEncryptionTrustLevelWarning:
statusText = NSLocalizedStringFromTable(@"room_participants_action_security_status_warning", @"Vector", nil);
@@ -1031,7 +1045,14 @@
{
if (self.encryptionTrustLevel == UserEncryptionTrustLevelNotVerified)
{
[self startUserVerification];
if (self.isRoomMemberCurrentUser)
{
[self presentCompleteSecurity];
}
else
{
[self startUserVerification];
}
}
else
{