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

Merge pull request #2961 from vector-im/riot_2959

Browse source 
E2E: Do not warn anymore for unknown devices
This commit is contained in:
manuroe 2020-01-31 18:01:02 +01:00 committed by GitHub
commit 02cd98d3fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.rst
View file

@ -2,6 +2,7 @@ Changes in 0.11.0 (2020-xx-xx)
=============================================== ===============================================
Improvements: Improvements:
* E2E: Do not warn anymore for unknown devices
* ON/OFF Cross-signing development in a Lab setting (#2855). * ON/OFF Cross-signing development in a Lab setting (#2855).
* RoomVC: Update encryption decoration with shields (#2934, #2930, #2906). * RoomVC: Update encryption decoration with shields (#2934, #2930, #2906).
* Settings: Remove "End-to-End Encryption" from the LABS section (#2941). * Settings: Remove "End-to-End Encryption" from the LABS section (#2941).

3
Riot/AppDelegate.m
View file

@ -2802,6 +2802,9 @@ NSString *const AppDelegateDidValidateEmailNotificationClientSecretKey = @"AppDe
break; break;
} }
} }
// Do not warn for unknown devices if cross-signing is enabled
mxSession.crypto.warnOnUnknowDevices = !RiotSettings.shared.enableCrossSigning;
} }
else if (mxSession.state == MXSessionStateClosed) else if (mxSession.state == MXSessionStateClosed)
{ {

2
Riot/Modules/Settings/SettingsViewController.m
View file

@ -3056,6 +3056,8 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate>
UISwitch *switchButton = (UISwitch*)sender; UISwitch *switchButton = (UISwitch*)sender;
RiotSettings.shared.enableCrossSigning = switchButton.isOn; RiotSettings.shared.enableCrossSigning = switchButton.isOn;
self.mainSession.crypto.warnOnUnknowDevices = !RiotSettings.shared.enableCrossSigning;
} }
- (void)togglePinRoomsWithMissedNotif:(id)sender - (void)togglePinRoomsWithMissedNotif:(id)sender