Store last used account in MigrationFromV1ToV2

2 files changed, 12 insertions, 13 deletions

diff --git a/ios/MullvadVPN/SettingsManager/SettingsManager.swift b/ios/MullvadVPN/SettingsManager/SettingsManager.swift
index 458dda8b73..d27c289fbd 100644
--- a/ios/MullvadVPN/SettingsManager/SettingsManager.swift
+++ b/ios/MullvadVPN/SettingsManager/SettingsManager.swift
@@ -187,19 +187,6 @@ enum SettingsManager {
             return nil
         }
 
-        // Set legacy account number as last used.
-        logger.debug("Found legacy account number.")
-        logger.debug("Store last used account.")
-
-        do {
-            try Self.setLastUsedAccount(storedAccountNumber)
-        } catch {
-            logger.error(
-                error: error,
-                message: "Failed to store last used account."
-            )
-        }
-
         // List legacy settings stored in keychain.
         logger.debug("Read legacy settings...")
 
diff --git a/ios/MullvadVPN/SettingsManager/SettingsMigration/MigrationFromV1ToV2.swift b/ios/MullvadVPN/SettingsManager/SettingsMigration/MigrationFromV1ToV2.swift
index ea95cb9632..ffa5839943 100644
--- a/ios/MullvadVPN/SettingsManager/SettingsMigration/MigrationFromV1ToV2.swift
+++ b/ios/MullvadVPN/SettingsManager/SettingsMigration/MigrationFromV1ToV2.swift
@@ -42,6 +42,18 @@ class MigrationFromV1ToV2: Migration {
     ) {
         let storedAccountNumber = legacySettings.accountNumber
 
+        // Store last used account number.
+        logger.debug("Store legacy account number as last used account.")
+        do {
+            if let accountData = storedAccountNumber.data(using: .utf8) {
+                try store.write(accountData, for: .lastUsedAccount)
+            } else {
+                logger.error("Failed to encode account number into utf-8 data.")
+            }
+        } catch {
+            logger.error(error: error, message: "Failed to store last used account.")
+        }
+
         // Fetch remote data concurrently.
         logger.debug("Fetching account and device data...")
         let dispatchGroup = DispatchGroup()