Merge branch 'remove-settings-only-on-app-uninstall-ios-577'

3 files changed, 4 insertions, 7 deletions

diff --git a/ios/MullvadVPN/AppDelegate.swift b/ios/MullvadVPN/AppDelegate.swift
index eab4b8bf5d..a2239e3e7c 100644
--- a/ios/MullvadVPN/AppDelegate.swift
+++ b/ios/MullvadVPN/AppDelegate.swift
@@ -502,7 +502,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                 }
 
                 SettingsManager.resetStore(completely: true)
+
                 self.accessMethodRepository.reloadWithDefaultsAfterDataRemoval()
+                // At app startup, the relay cache tracker will get populated with a list of overriden IPs.
+                // The overriden IPs will get wiped, therefore, the cache needs to be pruned as well.
+                try? self.relayCacheTracker.refreshCachedRelays()
             }
 
             FirstTimeLaunch.setHasFinished()
diff --git a/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift b/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift
index da9dab6fef..db6e1cc814 100644
--- a/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift
+++ b/ios/MullvadVPN/TunnelManager/SetAccountOperation.swift
@@ -161,8 +161,6 @@ class SetAccountOperation: ResultOperation<StoredAccountData?> {
         completion: @escaping (Result<Void, Error>) -> Void
     ) {
         deleteAccount(accountNumber: accountNumber) { [self] result in
-            interactor.setSettings(LatestTunnelSettings(), persist: true)
-
             if result.isSuccess {
                 interactor.removeLastUsedAccount()
             }
@@ -231,9 +229,6 @@ class SetAccountOperation: ResultOperation<StoredAccountData?> {
             )
         )
 
-        // Reset tunnel settings.
-        interactor.setSettings(LatestTunnelSettings(), persist: true)
-
         // Transition device state to logged in.
         interactor.setDeviceState(.loggedIn(accountData, storedDeviceData), persist: true)
     }
diff --git a/ios/MullvadVPN/TunnelManager/TunnelManager.swift b/ios/MullvadVPN/TunnelManager/TunnelManager.swift
index 3f4c4c67d5..cc4ce36da6 100644
--- a/ios/MullvadVPN/TunnelManager/TunnelManager.swift
+++ b/ios/MullvadVPN/TunnelManager/TunnelManager.swift
@@ -1092,8 +1092,6 @@ final class TunnelManager: StorePaymentObserver {
     }
 
     private func unsetTunnelConfiguration(completion: @escaping () -> Void) {
-        setSettings(LatestTunnelSettings(), persist: true)
-
         // Tell the caller to unsubscribe from VPN status notifications.
         prepareForVPNConfigurationDeletion()