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

Present host wizard in presented vc or root

This commit is contained in:
Davide De Rosa 2018-10-27 20:37:30 +02:00
parent 326c5b823d
commit c084c71db3
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Passepartout-iOS/AppDelegate.swift
View File

@ -89,45 +89,47 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
guard let root = window?.rootViewController else { guard let root = window?.rootViewController else {
fatalError("No window.rootViewController?") fatalError("No window.rootViewController?")
} }
let topmost = root.presentedViewController ?? root
let fm = FileManager.default let fm = FileManager.default
guard let parsedFile = ParsedFile.from(url, withErrorAlertIn: root) else { guard let parsedFile = ParsedFile.from(url, withErrorAlertIn: topmost) else {
try? fm.removeItem(at: url) try? fm.removeItem(at: url)
return true return true
} }
if let warning = parsedFile.warning { if let warning = parsedFile.warning {
ParsedFile.alertImportWarning(url: url, in: root, withWarning: warning) { ParsedFile.alertImportWarning(url: url, in: topmost, withWarning: warning) {
if $0 { if $0 {
self.handleParsedFile(parsedFile, in: root) self.handleParsedFile(parsedFile, in: topmost)
} else { } else {
try? fm.removeItem(at: url) try? fm.removeItem(at: url)
} }
} }
return true return true
} }
handleParsedFile(parsedFile, in: root) handleParsedFile(parsedFile, in: topmost)
return true return true
} }
private func handleParsedFile(_ parsedFile: ParsedFile, in root: UIViewController) { private func handleParsedFile(_ parsedFile: ParsedFile, in target: UIViewController) {
// 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 = target as? UINavigationController, let wizard = nav.topViewController as? WizardHostViewController {
wizard.parsedFile = parsedFile wizard.parsedFile = parsedFile
wizard.removesConfigurationOnCancel = true wizard.removesConfigurationOnCancel = true
return return
} }
// present now // present now
let nav = StoryboardScene.Organizer.wizardHostIdentifier.instantiate() let wizardNav = StoryboardScene.Organizer.wizardHostIdentifier.instantiate()
guard let wizard = nav.topViewController as? WizardHostViewController else { guard let wizard = wizardNav.topViewController as? WizardHostViewController else {
fatalError("Expected WizardHostViewController from storyboard") fatalError("Expected WizardHostViewController from storyboard")
} }
wizard.parsedFile = parsedFile wizard.parsedFile = parsedFile
wizard.removesConfigurationOnCancel = true wizard.removesConfigurationOnCancel = true
nav.modalPresentationStyle = .formSheet wizardNav.modalPresentationStyle = .formSheet
root.present(nav, animated: true, completion: nil) target.present(wizardNav, animated: true, completion: nil)
} }
} }