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

Security settings: Do not ask to complete security if there is no cross-signing

Browse source 
Fix #3147
This commit is contained in:
manuroe 2020-04-24 18:47:57 +02:00
parent 2d5197c9e7
commit a7b61baab0
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.rst
View file

@ -9,6 +9,7 @@ Improvements:
Bug fix:
* Settings: Security, present complete security when my device is not trusted (#3127).
* Settings: Security: Do not ask to complete security if there is no cross-signing (#3147).
Changes in 0.11.0 (2020-04-17)
===============================================

9
Riot/Modules/Settings/Security/SecurityViewController.m
View file

@ -934,7 +934,14 @@ UIDocumentInteractionControllerDelegate>
{
MXDevice *device = devicesArray[deviceIndex];
if (self.mainSession.crypto.crossSigning.canCrossSign)
if (self.mainSession.crypto.crossSigning.state == MXCrossSigningStateNotBootstrapped)
{
// Display the device details. The verification will fail there.
ManageSessionViewController *viewController = [ManageSessionViewController instantiateWithMatrixSession:self.mainSession andDevice:device];
[self pushViewController:viewController];
}
else if (self.mainSession.crypto.crossSigning.canCrossSign)
{
ManageSessionViewController *viewController = [ManageSessionViewController instantiateWithMatrixSession:self.mainSession andDevice:device];