ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add intermediate "Info" screen.

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jeroen Leenarts
2018-09-15 21:24:52 +02:00
parent 3a8f8ef9e6
commit 6104546fc6
5 changed files with 472 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WireGuard/Coordinators/AppCoordinator.swift
+34 -17
View File
@@ -261,6 +261,22 @@ class AppCoordinator: RootViewCoordinator {
})
}
func showTunnelInfoViewController(tunnel: Tunnel, context: NSManagedObjectContext) {
let tunnelInfoViewController = storyboard.instantiateViewController(type: TunnelInfoTableViewController.self)
tunnelInfoViewController.configure(context: context, delegate: self, tunnel: tunnel)
self.navigationController.pushViewController(tunnelInfoViewController, animated: true)
}
func showTunnelConfigurationViewController(tunnel: Tunnel?, context: NSManagedObjectContext) {
let tunnelConfigurationViewController = storyboard.instantiateViewController(type: TunnelConfigurationTableViewController.self)
tunnelConfigurationViewController.configure(context: context, delegate: self, tunnel: tunnel)
self.navigationController.pushViewController(tunnelConfigurationViewController, animated: true)
}
public func showError(_ error: Error) {
showAlert(title: NSLocalizedString("Error", comment: "Error alert title"), message: error.localizedDescription)
}
@@ -289,6 +305,20 @@ class AppCoordinator: RootViewCoordinator {
}
}
extension AppCoordinator: TunnelInfoTableViewControllerDelegate {
func configure(tunnel: Tunnel, tunnelInfoTableViewController: TunnelInfoTableViewController) {
print("configure tunnel \(tunnel)")
let editContext = persistentContainer.newBackgroundContext()
var backgroundTunnel: Tunnel?
editContext.performAndWait {
backgroundTunnel = editContext.object(with: tunnel.objectID) as? Tunnel
}
showTunnelConfigurationViewController(tunnel: backgroundTunnel, context: editContext)
}
}
extension AppCoordinator: TunnelsTableViewControllerDelegate {
func exportTunnels(tunnelsTableViewController: TunnelsTableViewController, barButtonItem: UIBarButtonItem) {
self.exportConfigs(barButtonItem: barButtonItem)
@@ -401,23 +431,10 @@ extension AppCoordinator: TunnelsTableViewControllerDelegate {
manager?.connection.stopVPNTunnel()
}
func configure(tunnel: Tunnel, tunnelsTableViewController: TunnelsTableViewController) {
print("configure tunnel \(tunnel)")
let editContext = persistentContainer.newBackgroundContext()
var backgroundTunnel: Tunnel?
editContext.performAndWait {
backgroundTunnel = editContext.object(with: tunnel.objectID) as? Tunnel
}
func info(tunnel: Tunnel, tunnelsTableViewController: TunnelsTableViewController) {
print("info tunnel \(tunnel)")
showTunnelConfigurationViewController(tunnel: backgroundTunnel, context: editContext)
}
func showTunnelConfigurationViewController(tunnel: Tunnel?, context: NSManagedObjectContext) {
let tunnelConfigurationViewController = storyboard.instantiateViewController(type: TunnelConfigurationTableViewController.self)
tunnelConfigurationViewController.configure(context: context, delegate: self, tunnel: tunnel)
self.navigationController.pushViewController(tunnelConfigurationViewController, animated: true)
showTunnelInfoViewController(tunnel: tunnel, context: self.persistentContainer.viewContext)
}
func delete(tunnel: Tunnel, tunnelsTableViewController: TunnelsTableViewController) {
@@ -476,7 +493,7 @@ extension AppCoordinator: TunnelsTableViewControllerDelegate {
}
_ = refreshProviderManagers().then { () -> Promise<Void> in
self.navigationController.popToRootViewController(animated: true)
self.navigationController.popViewController(animated: true)
return Promise.value(())
}
}