From 06ecd3367f72b09419f3193f42b672c90a130dba Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sat, 27 Oct 2018 20:38:08 +0200 Subject: [PATCH] Overwrite pending profile when reimporting - Overwrite title field - Remove old .ovpn useSuggestedTitle() is only called on load, it will never overwrite user input unless there's a new import. --- Passepartout-iOS/AppDelegate.swift | 3 +++ .../Scenes/Organizer/WizardHostViewController.swift | 7 +------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Passepartout-iOS/AppDelegate.swift b/Passepartout-iOS/AppDelegate.swift index bab9e9a3..e2d76aab 100644 --- a/Passepartout-iOS/AppDelegate.swift +++ b/Passepartout-iOS/AppDelegate.swift @@ -115,6 +115,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele // already presented: update parsed configuration if let nav = target as? UINavigationController, let wizard = nav.topViewController as? WizardHostViewController { + if let oldURL = wizard.parsedFile?.url { + try? FileManager.default.removeItem(at: oldURL) + } wizard.parsedFile = parsedFile wizard.removesConfigurationOnCancel = true return diff --git a/Passepartout-iOS/Scenes/Organizer/WizardHostViewController.swift b/Passepartout-iOS/Scenes/Organizer/WizardHostViewController.swift index e08da738..7c165371 100644 --- a/Passepartout-iOS/Scenes/Organizer/WizardHostViewController.swift +++ b/Passepartout-iOS/Scenes/Organizer/WizardHostViewController.swift @@ -87,12 +87,7 @@ class WizardHostViewController: UITableViewController, TableModelHost { // MARK: Actions private func useSuggestedTitle() { - guard let field = cellTitle?.field else { - return - } - if field.text?.isEmpty ?? true { - field.text = parsedFile?.url.normalizedFilename - } + cellTitle?.field.text = parsedFile?.url.normalizedFilename } @IBAction private func next() {