diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2021-05-05 15:37:49 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2021-05-05 15:37:49 +0200 |
| commit | 58e5c89cd89b5dbf33ac39d7febbca8487beb558 (patch) | |
| tree | 1c0e0230aecaa9fb49b65bde9db9a8658f76cb54 | |
| parent | 22ed0c52785254726486634ffe6f5fd9fd7160bc (diff) | |
| parent | 5ea34e169f87146382d247c91eb3bbe8d09ac872 (diff) | |
| download | mullvadvpn-58e5c89cd89b5dbf33ac39d7febbca8487beb558.tar.xz mullvadvpn-58e5c89cd89b5dbf33ac39d7febbca8487beb558.zip | |
Merge branch 'fix-tunnel-manager-settings-migration'
| -rw-r--r-- | ios/CHANGELOG.md | 1 | ||||
| -rw-r--r-- | ios/MullvadVPN/TunnelManager.swift | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ios/CHANGELOG.md b/ios/CHANGELOG.md index dd504ed5fe..36ece08e5a 100644 --- a/ios/CHANGELOG.md +++ b/ios/CHANGELOG.md @@ -29,6 +29,7 @@ Line wrap the file at 100 chars. Th ### Fixed - Fix bug which caused the tunnel manager to become unresponsive in the rare event of failure to disable on-demand when stopping the tunnel from within the app. +- Fix bug that caused the app to skip tunnel settings migration from older versions of the app. ## [2021.1] - 2021-03-16 diff --git a/ios/MullvadVPN/TunnelManager.swift b/ios/MullvadVPN/TunnelManager.swift index 9f0e478daf..ddac561e93 100644 --- a/ios/MullvadVPN/TunnelManager.swift +++ b/ios/MullvadVPN/TunnelManager.swift @@ -216,7 +216,7 @@ class TunnelManager { case .removeTunnelSettings: return "Failed to remove the tunnel settings" case .obtainPersistentKeychainReference: - return "Failed to obtain the persistent keychain refrence" + return "Failed to obtain the persistent keychain reference" case .pushWireguardKey: return "Failed to push the WireGuard key to server" case .replaceWireguardKey: @@ -315,7 +315,7 @@ class TunnelManager { if let error = error { finish(.failure(.loadAllVPNConfigurations(error))) } else { - if let accountToken = self.accountToken { + if let accountToken = accountToken { // Migrate the tunnel settings if needed self.migrateTunnelSettings(accountToken: accountToken) |