Merge branch 'allow-infrastructure-to-test-their-ios-37'

5 files changed, 10 insertions, 6 deletions

diff --git a/ios/MullvadREST/RESTDefaults.swift b/ios/MullvadREST/RESTDefaults.swift
index c8b7fc7efc..8c0afe1f00 100644
--- a/ios/MullvadREST/RESTDefaults.swift
+++ b/ios/MullvadREST/RESTDefaults.swift
@@ -16,6 +16,9 @@ extension REST {
     /// Default API endpoint.
     public static let defaultAPIEndpoint = AnyIPEndpoint(string: "45.83.223.196:443")!
 
+    /// Disables API IP address cache when in staging environment and sticks to using default API endpoint instead.
+    public static let isStagingEnvironment = false
+
     /// Default network timeout for API requests.
     public static let defaultAPINetworkTimeout: TimeInterval = 10
 }
diff --git a/ios/MullvadREST/RESTNetworkOperation.swift b/ios/MullvadREST/RESTNetworkOperation.swift
index 64f07a3e93..6f723e5865 100644
--- a/ios/MullvadREST/RESTNetworkOperation.swift
+++ b/ios/MullvadREST/RESTNetworkOperation.swift
@@ -112,7 +112,7 @@ extension REST {
                 return
             }
 
-            let endpoint = addressCacheStore.getCurrentEndpoint()
+            let endpoint = REST.isStagingEnvironment ? REST.defaultAPIEndpoint : addressCacheStore.getCurrentEndpoint()
 
             do {
                 let request = try requestHandler.createURLRequest(
@@ -211,7 +211,9 @@ extension REST {
                     break
 
                 default:
-                    _ = addressCacheStore.selectNextEndpoint(endpoint)
+                    if !REST.isStagingEnvironment {
+                        _ = addressCacheStore.selectNextEndpoint(endpoint)
+                    }
                 }
             }
 
diff --git a/ios/MullvadVPN/SettingsManager/SettingsManager.swift b/ios/MullvadVPN/SettingsManager/SettingsManager.swift
index 06ae10f1a6..f24dfa3935 100644
--- a/ios/MullvadVPN/SettingsManager/SettingsManager.swift
+++ b/ios/MullvadVPN/SettingsManager/SettingsManager.swift
@@ -130,7 +130,7 @@ enum SettingsManager {
         let handleCompletion = { (result: SettingsMigrationResult) in
             // Reset store upon failure to migrate settings.
             if case .failure = result {
-                self.resetStore()
+                resetStore()
             }
             completion(result)
         }
diff --git a/ios/MullvadVPN/View controllers/Login/LoginViewController.swift b/ios/MullvadVPN/View controllers/Login/LoginViewController.swift
index e2770f65bf..fbef18bbc6 100644
--- a/ios/MullvadVPN/View controllers/Login/LoginViewController.swift
+++ b/ios/MullvadVPN/View controllers/Login/LoginViewController.swift
@@ -141,8 +141,7 @@ class LoginViewController: UIViewController, RootContainment {
         // There is no need to set the input accessory toolbar on iPad since it has a dedicated
         // button to dismiss the keyboard.
         if case .phone = UIDevice.current.userInterfaceIdiom {
-            contentView.accountInputGroup.textField.inputAccessoryView = self
-                .accountInputAccessoryToolbar
+            contentView.accountInputGroup.textField.inputAccessoryView = accountInputAccessoryToolbar
         } else {
             contentView.accountInputGroup.textField.inputAccessoryView = nil
         }
diff --git a/ios/RelaySelector/RelaySelector.swift b/ios/RelaySelector/RelaySelector.swift
index 9c3472cf74..2c315f5723 100644
--- a/ios/RelaySelector/RelaySelector.swift
+++ b/ios/RelaySelector/RelaySelector.swift
@@ -130,7 +130,7 @@ public enum RelaySelector {
             let endPort = inputRange[1]
 
             if startPort <= endPort {
-                return (startPort ... endPort)
+                return startPort ... endPort
             } else {
                 return nil
             }