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

Retain credentials of replaced host profile

This commit is contained in:
Davide De Rosa 2018-10-27 15:56:33 +02:00
parent b2953bdd25
commit 33849c8ec8
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- Warn about .ovpn containing potentially unsupported compression. [#16](https://github.com/keeshux/passepartout-ios/issues/16) - Warn about .ovpn containing potentially unsupported compression. [#16](https://github.com/keeshux/passepartout-ios/issues/16)
- Retain credentials of replaced host profile.
## 1.0 beta 1107 (2018-10-26) ## 1.0 beta 1107 (2018-10-26)

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

@ -108,22 +108,27 @@ class WizardHostViewController: UITableViewController, TableModelHost, Wizard {
let profile = HostConnectionProfile(title: enteredTitle, hostname: file.hostname) let profile = HostConnectionProfile(title: enteredTitle, hostname: file.hostname)
profile.parameters = file.configuration profile.parameters = file.configuration
guard !TransientStore.shared.service.containsProfile(profile) else { let service = TransientStore.shared.service
guard !service.containsProfile(profile) else {
let replacedProfile = service.profile(withContext: profile.context, id: profile.id)
let alert = Macros.alert(title, L10n.Wizards.Host.Alerts.Existing.message) let alert = Macros.alert(title, L10n.Wizards.Host.Alerts.Existing.message)
alert.addDefaultAction(L10n.Global.ok) { alert.addDefaultAction(L10n.Global.ok) {
self.next(withProfile: profile) self.next(withProfile: profile, replacedProfile: replacedProfile)
} }
alert.addCancelAction(L10n.Global.cancel) alert.addCancelAction(L10n.Global.cancel)
present(alert, animated: true, completion: nil) present(alert, animated: true, completion: nil)
return return
} }
next(withProfile: profile) next(withProfile: profile, replacedProfile: nil)
} }
private func next(withProfile profile: HostConnectionProfile) { private func next(withProfile profile: HostConnectionProfile, replacedProfile: ConnectionProfile?) {
createdProfile = profile createdProfile = profile
let accountVC = StoryboardScene.Main.accountIdentifier.instantiate() let accountVC = StoryboardScene.Main.accountIdentifier.instantiate()
if let replacedProfile = replacedProfile {
accountVC.currentCredentials = TransientStore.shared.service.credentials(for: replacedProfile)
}
accountVC.delegate = self accountVC.delegate = self
navigationController?.pushViewController(accountVC, animated: true) navigationController?.pushViewController(accountVC, animated: true)
} }