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

Tunnel creation: Saving a configuration 

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2018-10-23 17:23:46 +05:30
parent 722b3f6c7b
commit 05efb453f3
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
WireGuard/WireGuard/UI/iOS/TunnelEditTableViewController.swift
View File

@ -25,9 +25,11 @@ class TunnelEditTableViewController: UITableViewController {
.deletePeer]
]
let tunnelsManager: TunnelsManager
let tunnelViewModel: TunnelViewModel
init() {
init(tunnelsManager tm: TunnelsManager) {
tunnelsManager = tm
tunnelViewModel = TunnelViewModel(tunnelConfiguration: nil)
super.init(style: .grouped)
self.modalPresentationStyle = .formSheet
@ -52,12 +54,35 @@ class TunnelEditTableViewController: UITableViewController {
}
@objc func saveTapped() {
print("Save")
self.tableView.endEditing(false)
let tunnelSaveResult = tunnelViewModel.save()
switch (tunnelSaveResult) {
case .error(let errorMessage):
let erroringConfiguration = (tunnelViewModel.interfaceData.validatedConfiguration == nil) ? "Interface" : "Peer"
showErrorAlert(title: "Invalid \(erroringConfiguration)", message: errorMessage)
case .saved(let tunnelConfiguration):
tunnelsManager.add(tunnelConfiguration: tunnelConfiguration) { [weak self] (error) in
if let error = error {
print("Could not save: \(error)")
self?.showErrorAlert(title: "Could not save", message: "Internal error")
} else {
self?.dismiss(animated: true, completion: nil)
}
}
}
}
@objc func cancelTapped() {
dismiss(animated: true, completion: nil)
}
func showErrorAlert(title: String, message: String) {
let okAction = UIAlertAction(title: "Ok", style: .default)
let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
alert.addAction(okAction)
self.present(alert, animated: true, completion: nil)
}
}
// MARK: UITableViewDataSource

10
WireGuard/WireGuard/UI/iOS/TunnelsListTableViewController.swift
View File

@ -40,11 +40,11 @@ class TunnelsListTableViewController: UITableViewController {
message: "Add a tunnel",
preferredStyle: .actionSheet)
alert.addAction(
UIAlertAction(title: "Create from scratch", style: .default) { (action) in
let editVC = TunnelEditTableViewController()
let editNC = UINavigationController(rootViewController: editVC)
self.present(editNC, animated: true) {
print("Done")
UIAlertAction(title: "Create from scratch", style: .default) { [weak self] (action) in
if let s = self, let tunnelsManager = s.tunnelsManager {
let editVC = TunnelEditTableViewController(tunnelsManager: tunnelsManager)
let editNC = UINavigationController(rootViewController: editVC)
s.present(editNC, animated: true)
}
}
)