AddressCache: use mutex lock in loadFromFile() and log all errors except when no file on disk

1 files changed, 15 insertions, 8 deletions

diff --git a/ios/MullvadREST/AddressCache.swift b/ios/MullvadREST/AddressCache.swift
index da27798c9d..774c779fe8 100644
--- a/ios/MullvadREST/AddressCache.swift
+++ b/ios/MullvadREST/AddressCache.swift
@@ -113,17 +113,24 @@ extension REST {
             return cache.updatedAt
         }
 
-        /// Initializes the cache by reading the a cached file on disk.
+        /// Initializes cache by reading it from file on disk.
         ///
         /// If no cache file is present, a default API endpoint will be selected instead.
         public func loadFromFile() {
-            // The first time the application is ran, this statement will fail as there is no cache. This is fine.
-            // The cache will be filled when either `getCurrentEndpoint` or `setEndpoints()` are called.
-            do {
-                cache = try fileCache.read()
-            } catch {
-                logger.debug("Initialized cache with default API endpoint.")
-                cache = Self.defaultCachedAddresses
+            cacheLock.withLock {
+                // The first time the application is ran, this statement will fail as there is no cache. This is fine.
+                // The cache will be filled when either `getCurrentEndpoint()` or `setEndpoints()` are called.
+                do {
+                    cache = try fileCache.read()
+                } catch {
+                    // Log all errors except when file is not on disk.
+                    if (error as? CocoaError)?.code != .fileReadNoSuchFile {
+                        logger.error(error: error, message: "Failed to load address cache from disk.")
+                    }
+
+                    logger.debug("Initialized cache with default API endpoint.")
+                    cache = Self.defaultCachedAddresses
+                }
             }
         }
     }