Skip to content

Commit 7541914

Browse files
committed
Replace TunnelManager setters with updateSettings
1 parent 899f03d commit 7541914

File tree

5 files changed

+5
-32
lines changed

5 files changed

+5
-32
lines changed

ios/MullvadVPN/Coordinators/RelayFilterCoordinator.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class RelayFilterCoordinator: Coordinator, Presentable, RelayCacheTrackerObserve
5858
var relayConstraints = tunnelManager.settings.relayConstraints
5959
relayConstraints.filter = .only(filter)
6060

61-
tunnelManager.setRelayConstraints(relayConstraints)
61+
tunnelManager.updateSettings([.relayConstraints(relayConstraints)])
6262

6363
didFinish?(self, filter)
6464
}

ios/MullvadVPN/Coordinators/SelectLocationCoordinator.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class SelectLocationCoordinator: Coordinator, Presentable, Presenting, RelayCach
5858
var relayConstraints = tunnelManager.settings.relayConstraints
5959
relayConstraints.location = .only(relay)
6060

61-
tunnelManager.setRelayConstraints(relayConstraints) {
61+
tunnelManager.updateSettings([.relayConstraints(relayConstraints)]) {
6262
self.tunnelManager.startTunnel()
6363
}
6464

@@ -80,7 +80,7 @@ class SelectLocationCoordinator: Coordinator, Presentable, Presenting, RelayCach
8080
var relayConstraints = tunnelManager.settings.relayConstraints
8181
relayConstraints.filter = .only(filter)
8282

83-
tunnelManager.setRelayConstraints(relayConstraints)
83+
tunnelManager.updateSettings([.relayConstraints(relayConstraints)])
8484
}
8585

8686
selectLocationViewController.didFinish = { [weak self] in

ios/MullvadVPN/TunnelManager/TunnelManager.swift

-23
Original file line numberDiff line numberDiff line change
@@ -516,29 +516,6 @@ final class TunnelManager: StorePaymentObserver {
516516
)
517517
}
518518

519-
func setRelayConstraints(
520-
_ newConstraints: RelayConstraints,
521-
completionHandler: (() -> Void)? = nil
522-
) {
523-
scheduleSettingsUpdate(
524-
taskName: "Set relay constraints",
525-
modificationBlock: { settings in
526-
settings.relayConstraints = newConstraints
527-
},
528-
completionHandler: completionHandler
529-
)
530-
}
531-
532-
func setDNSSettings(_ newDNSSettings: DNSSettings, completionHandler: (() -> Void)? = nil) {
533-
scheduleSettingsUpdate(
534-
taskName: "Set DNS settings",
535-
modificationBlock: { settings in
536-
settings.dnsSettings = newDNSSettings
537-
},
538-
completionHandler: completionHandler
539-
)
540-
}
541-
542519
func refreshRelayCacheTracker() throws {
543520
try relayCacheTracker.refreshCachedRelays()
544521
}

ios/MullvadVPN/View controllers/Preferences/CustomDNSViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class CustomDNSViewController: UITableViewController, PreferencesDataSourceDeleg
9595
// MARK: - PreferencesDataSourceDelegate
9696

9797
func didChangeViewModel(_ viewModel: PreferencesViewModel) {
98-
interactor.setDNSSettings(viewModel.asDNSSettings())
98+
interactor.updateSettings([.dnsSettings(viewModel.asDNSSettings())])
9999
}
100100

101101
func showInfo(for item: PreferencesInfoButtonItem) {

ios/MullvadVPN/View controllers/Preferences/PreferencesInteractor.swift

+1-5
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ final class PreferencesInteractor {
4040
tunnelManager.updateSettings(changes, completionHandler: completion)
4141
}
4242

43-
func setDNSSettings(_ newDNSSettings: DNSSettings, completion: (() -> Void)? = nil) {
44-
tunnelManager.setDNSSettings(newDNSSettings, completionHandler: completion)
45-
}
46-
4743
func setPort(_ port: UInt16?, completion: (() -> Void)? = nil) {
4844
var relayConstraints = tunnelManager.settings.relayConstraints
4945

@@ -53,7 +49,7 @@ final class PreferencesInteractor {
5349
relayConstraints.port = .any
5450
}
5551

56-
tunnelManager.setRelayConstraints(relayConstraints, completionHandler: completion)
52+
tunnelManager.updateSettings([.relayConstraints(relayConstraints)], completionHandler: completion)
5753
}
5854
}
5955

0 commit comments

Comments
 (0)