Commit 41210682 authored by Jose Blaya's avatar Jose Blaya
Browse files

Merge branch 'release/2.8.0' into release/3.0.0

parents 15217008 91083e51
......@@ -376,6 +376,16 @@ class SettingsViewController: AutolayoutViewController {
let savedServer = pendingPreferences.preferredServer
pendingPreferences.reset()
pendingPreferences.preferredServer = savedServer
// reset NMT preferences
let preferences = Client.preferences.editable()
preferences.trustedNetworks = pendingPreferences.trustedNetworks
preferences.availableNetworks = pendingPreferences.availableNetworks
preferences.shouldConnectForAllNetworks = pendingPreferences.shouldConnectForAllNetworks
preferences.useWiFiProtection = pendingPreferences.useWiFiProtection
preferences.trustCellularData = pendingPreferences.trustCellularData
preferences.commit()
guard let currentOpenVPNConfiguration = pendingPreferences.vpnCustomConfiguration(for: PIATunnelProfile.vpnType) as? PIATunnelProvider.Configuration else {
fatalError("No default VPN custom configuration provided for PIA protocol")
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment