Drop configurability of URLSession in MullvadRest

7 files changed, 9 insertions, 14 deletions

diff --git a/ios/MullvadVPN/Account.swift b/ios/MullvadVPN/Account.swift
index a3eea5157c..6de4b7bc28 100644
--- a/ios/MullvadVPN/Account.swift
+++ b/ios/MullvadVPN/Account.swift
@@ -102,7 +102,7 @@ class Account {
         case exclusive
     }
 
-    private let rest = MullvadRest(session: URLSession(configuration: .ephemeral))
+    private let rest = MullvadRest()
     private let operationQueue = OperationQueue()
     private lazy var exclusivityController = ExclusivityController<ExclusivityCategory>(operationQueue: operationQueue)
 
diff --git a/ios/MullvadVPN/AppStorePaymentManager.swift b/ios/MullvadVPN/AppStorePaymentManager.swift
index 08d52a9ec1..ac1bb386b7 100644
--- a/ios/MullvadVPN/AppStorePaymentManager.swift
+++ b/ios/MullvadVPN/AppStorePaymentManager.swift
@@ -127,7 +127,7 @@ class AppStorePaymentManager: NSObject, SKPaymentTransactionObserver {
     private let operationQueue = OperationQueue()
     private lazy var exclusivityController = ExclusivityController<ExlcusivityCategory>(operationQueue: operationQueue)
 
-    private let rest = MullvadRest(session: URLSession(configuration: .ephemeral))
+    private let rest = MullvadRest()
     private let queue: SKPaymentQueue
 
     private var observerList = ObserverList<AnyAppStorePaymentObserver>()
diff --git a/ios/MullvadVPN/AutomaticKeyRotationManager.swift b/ios/MullvadVPN/AutomaticKeyRotationManager.swift
index 3d7321c68c..6a16d55a87 100644
--- a/ios/MullvadVPN/AutomaticKeyRotationManager.swift
+++ b/ios/MullvadVPN/AutomaticKeyRotationManager.swift
@@ -48,7 +48,7 @@ class AutomaticKeyRotationManager {
 
     private let logger = Logger(label: "AutomaticKeyRotationManager")
 
-    private let rest = MullvadRest(session: URLSession(configuration: .ephemeral))
+    private let rest = MullvadRest()
     private let persistentKeychainReference: Data
 
     /// A dispatch queue used for synchronization
diff --git a/ios/MullvadVPN/MullvadRest.swift b/ios/MullvadVPN/MullvadRest.swift
index cf01e1bc37..ae002dab75 100644
--- a/ios/MullvadVPN/MullvadRest.swift
+++ b/ios/MullvadVPN/MullvadRest.swift
@@ -416,11 +416,7 @@ struct RestSessionEndpoint<Input, Response> where Input: RestPayload {
 // MARK: - REST interface
 
 struct MullvadRest {
-    let session: URLSession
-
-    init(session: URLSession = URLSession(configuration: .ephemeral)) {
-        self.session = session
-    }
+    let session = URLSession(configuration: .ephemeral)
 
     func createAccount() -> RestSessionEndpoint<EmptyPayload, AccountResponse> {
         return RestSessionEndpoint(session: session, endpoint: Self.createAccount())
diff --git a/ios/MullvadVPN/ProblemReportViewController.swift b/ios/MullvadVPN/ProblemReportViewController.swift
index 0832fd920c..157597d028 100644
--- a/ios/MullvadVPN/ProblemReportViewController.swift
+++ b/ios/MullvadVPN/ProblemReportViewController.swift
@@ -13,7 +13,7 @@ class ProblemReportViewController: UIViewController, UITextFieldDelegate, Condit
     private var textViewKeyboardResponder: AutomaticKeyboardResponder?
     private var scrollViewKeyboardResponder: AutomaticKeyboardResponder?
 
-    private let mullvadRest = MullvadRest(session: URLSession(configuration: .ephemeral))
+    private let mullvadRest = MullvadRest()
     private lazy var consolidatedLog: ConsolidatedApplicationLog = {
         let securityGroupIdentifier = ApplicationConfiguration.securityGroupIdentifier
 
diff --git a/ios/MullvadVPN/RelayCache.swift b/ios/MullvadVPN/RelayCache.swift
index a41e64c3ac..7546c51f57 100644
--- a/ios/MullvadVPN/RelayCache.swift
+++ b/ios/MullvadVPN/RelayCache.swift
@@ -69,7 +69,7 @@ class RelayCache {
     private let logger = Logger(label: "RelayCache")
 
     /// Mullvad REST client
-    private let rest: MullvadRest
+    private let rest = MullvadRest()
 
     /// The cache location used by the class instance
     private let cacheFileURL: URL
@@ -103,10 +103,9 @@ class RelayCache {
     private let observerList = ObserverList<AnyRelayCacheObserver>()
 
     /// A shared instance of `RelayCache`
-    static let shared = RelayCache(cacheFileURL: defaultCacheFileURL, networkSession: URLSession(configuration: .ephemeral))
+    static let shared = RelayCache(cacheFileURL: defaultCacheFileURL)
 
-    private init(cacheFileURL: URL, networkSession: URLSession) {
-        rest = MullvadRest(session: networkSession)
+    private init(cacheFileURL: URL) {
         self.cacheFileURL = cacheFileURL
     }
 
diff --git a/ios/MullvadVPN/TunnelManager.swift b/ios/MullvadVPN/TunnelManager.swift
index ddac561e93..6903856626 100644
--- a/ios/MullvadVPN/TunnelManager.swift
+++ b/ios/MullvadVPN/TunnelManager.swift
@@ -243,7 +243,7 @@ class TunnelManager {
     private let logger = Logger(label: "TunnelManager")
     private let dispatchQueue = DispatchQueue(label: "net.mullvad.MullvadVPN.TunnelManager")
 
-    private let rest = MullvadRest(session: URLSession(configuration: .ephemeral))
+    private let rest = MullvadRest()
     private var tunnelProvider: TunnelProviderManagerType?
     private var tunnelIpc: PacketTunnelIpc?