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

Delete openURL .ovpn on Cancel

This commit is contained in:
Davide De Rosa 2018-10-27 13:20:23 +02:00
parent 0d23187eef
commit 42c94c3a14
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Passepartout-iOS/AppDelegate.swift
View File

@ -99,6 +99,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
// already presented: update parsed configuration // already presented: update parsed configuration
if let nav = root.presentedViewController as? UINavigationController, let wizard = nav.topViewController as? WizardHostViewController { if let nav = root.presentedViewController as? UINavigationController, let wizard = nav.topViewController as? WizardHostViewController {
wizard.parsedFile = parsedFile wizard.parsedFile = parsedFile
wizard.removesConfigurationOnCancel = true
return true return true
} }
@ -108,6 +109,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
fatalError("Expected WizardHostViewController from storyboard") fatalError("Expected WizardHostViewController from storyboard")
} }
wizard.parsedFile = parsedFile wizard.parsedFile = parsedFile
wizard.removesConfigurationOnCancel = true
// best effort to delegate to main vc // best effort to delegate to main vc
let split = root as? UISplitViewController let split = root as? UISplitViewController

5
Passepartout-iOS/Scenes/Organizer/WizardHostViewController.swift
View File

@ -41,6 +41,8 @@ class WizardHostViewController: UITableViewController, TableModelHost, Wizard {
useSuggestedTitle() useSuggestedTitle()
} }
} }
var removesConfigurationOnCancel = false
private var createdProfile: HostConnectionProfile? private var createdProfile: HostConnectionProfile?
@ -148,6 +150,9 @@ class WizardHostViewController: UITableViewController, TableModelHost, Wizard {
} }
@IBAction private func close() { @IBAction private func close() {
if removesConfigurationOnCancel, let url = parsedFile?.url {
try? FileManager.default.removeItem(at: url)
}
dismiss(animated: true, completion: nil) dismiss(animated: true, completion: nil)
} }
} }