summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2023-10-13 10:49:57 +0200
committerAndrej Mihajlov <and@mullvad.net>2023-10-13 10:49:57 +0200
commit0e00f4056fbcf6b047fe1da7b4e4b4f24f9c9efc (patch)
tree2448e2b5e4417cef390a84903faf4003d5a3b7d7
parent4d6174765b5fef9c3d1b1f08328df79683ce8ba8 (diff)
parentd1127adac27b21022426379f94245e0ac8028a0f (diff)
downloadmullvadvpn-0e00f4056fbcf6b047fe1da7b4e4b4f24f9c9efc.tar.xz
mullvadvpn-0e00f4056fbcf6b047fe1da7b4e4b4f24f9c9efc.zip
Merge branch 'handle-load-config-error'
-rw-r--r--ios/MullvadVPN/TunnelManager/LoadTunnelConfigurationOperation.swift3
1 files changed, 2 insertions, 1 deletions
diff --git a/ios/MullvadVPN/TunnelManager/LoadTunnelConfigurationOperation.swift b/ios/MullvadVPN/TunnelManager/LoadTunnelConfigurationOperation.swift
index 74881d4969..d4c86a74f1 100644
--- a/ios/MullvadVPN/TunnelManager/LoadTunnelConfigurationOperation.swift
+++ b/ios/MullvadVPN/TunnelManager/LoadTunnelConfigurationOperation.swift
@@ -61,7 +61,8 @@ class LoadTunnelConfigurationOperation: ResultOperation<Void> {
private func readSettings() -> Result<LatestTunnelSettings?, Error> {
Result { try SettingsManager.readSettings() }
.flatMapError { error in
- if let error = error as? KeychainError, error == .itemNotFound {
+ if let error = error as? ReadSettingsVersionError,
+ let keychainError = error.underlyingError as? KeychainError, keychainError == .itemNotFound {
logger.debug("Settings not found in keychain.")
return .success(nil)