passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Commit network settings in separate method

This commit is contained in:
Davide De Rosa 2019-06-28 12:01:00 +02:00
parent ab189025b9
commit b45479a733
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Passepartout-iOS/Scenes/NetworkSettingsViewController.swift
View File

@ -53,10 +53,10 @@ class NetworkSettingsViewController: UITableViewController {
private lazy var networkChoices = ProfileNetworkChoices.with(profile: profile) private lazy var networkChoices = ProfileNetworkChoices.with(profile: profile)
private let networkSettings = ProfileNetworkSettings()
private lazy var clientNetworkSettings = profile?.clientNetworkSettings private lazy var clientNetworkSettings = profile?.clientNetworkSettings
private let networkSettings = ProfileNetworkSettings()
// MARK: TableModelHost // MARK: TableModelHost
let model: TableModel<SectionType, RowType> = TableModel() let model: TableModel<SectionType, RowType> = TableModel()
@ -125,22 +125,7 @@ class NetworkSettingsViewController: UITableViewController {
override func viewDidDisappear(_ animated: Bool) { override func viewDidDisappear(_ animated: Bool) {
super.viewDidDisappear(animated) super.viewDidDisappear(animated)
profile?.networkChoices = networkChoices commitChanges()
if networkChoices.gateway == .manual {
let settings = profile?.manualNetworkSettings ?? ProfileNetworkSettings()
settings.copyGateway(from: networkSettings)
profile?.manualNetworkSettings = settings
}
if networkChoices.dns == .manual {
let settings = profile?.manualNetworkSettings ?? ProfileNetworkSettings()
settings.copyDNS(from: networkSettings)
profile?.manualNetworkSettings = settings
}
if networkChoices.proxy == .manual {
let settings = profile?.manualNetworkSettings ?? ProfileNetworkSettings()
settings.copyProxy(from: networkSettings)
profile?.manualNetworkSettings = settings
}
} }
// MARK: Actions // MARK: Actions
@ -220,6 +205,25 @@ class NetworkSettingsViewController: UITableViewController {
log.debug("Network settings: \(networkSettings)") log.debug("Network settings: \(networkSettings)")
} }
private func commitChanges() {
profile?.networkChoices = networkChoices
if networkChoices.gateway == .manual {
let settings = profile?.manualNetworkSettings ?? ProfileNetworkSettings()
settings.copyGateway(from: networkSettings)
profile?.manualNetworkSettings = settings
}
if networkChoices.dns == .manual {
let settings = profile?.manualNetworkSettings ?? ProfileNetworkSettings()
settings.copyDNS(from: networkSettings)
profile?.manualNetworkSettings = settings
}
if networkChoices.proxy == .manual {
let settings = profile?.manualNetworkSettings ?? ProfileNetworkSettings()
settings.copyProxy(from: networkSettings)
profile?.manualNetworkSettings = settings
}
}
} }
// MARK: - // MARK: -