From 178d6e5b974b6d505169dfecb4c3128059ad5b72 Mon Sep 17 00:00:00 2001 From: manuroe Date: Thu, 30 Jan 2020 18:13:49 +0100 Subject: [PATCH] E2E: Do not warn anymore for unknown devices # 2959 --- CHANGES.rst | 1 + Riot/AppDelegate.m | 3 +++ Riot/Modules/Settings/SettingsViewController.m | 2 ++ 3 files changed, 6 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 2c9f973b5..7e311f7ab 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -2,6 +2,7 @@ Changes in 0.11.0 (2020-xx-xx) =============================================== Improvements: + * E2E: Do not warn anymore for unknown devices * ON/OFF Cross-signing development in a Lab setting (#2855). * RoomVC: Update encryption decoration with shields (#2934, #2930, #2906). * Settings: Remove "End-to-End Encryption" from the LABS section (#2941). diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m index ddde73e32..522c38bc1 100644 --- a/Riot/AppDelegate.m +++ b/Riot/AppDelegate.m @@ -2801,6 +2801,9 @@ NSString *const AppDelegateDidValidateEmailNotificationClientSecretKey = @"AppDe break; } } + + // Do not warn for unknown devices if cross-signing is enabled + mxSession.crypto.warnOnUnknowDevices = !RiotSettings.shared.enableCrossSigning; } else if (mxSession.state == MXSessionStateClosed) { diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m index a65477d66..dd5c79285 100644 --- a/Riot/Modules/Settings/SettingsViewController.m +++ b/Riot/Modules/Settings/SettingsViewController.m @@ -3056,6 +3056,8 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate> UISwitch *switchButton = (UISwitch*)sender; RiotSettings.shared.enableCrossSigning = switchButton.isOn; + + self.mainSession.crypto.warnOnUnknowDevices = !RiotSettings.shared.enableCrossSigning; } - (void)togglePinRoomsWithMissedNotif:(id)sender