lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Fix issue about remembering passphrase function (#74)

Browse source
This commit is contained in:
Bob Sun 2017-04-25 20:13:59 -07:00
parent 055ea243a3
commit d6c7b67fcc
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pass/Controllers/PGPKeyArmorSettingTableViewController.swift
View file

@ -28,6 +28,7 @@ class PGPKeyArmorSettingTableViewController: UITableViewController, UITextViewDe
let savePassphraseAlert = UIAlertController(title: "Passphrase", message: "Do you want to save the passphrase for later decryption?", preferredStyle: UIAlertControllerStyle.alert) let savePassphraseAlert = UIAlertController(title: "Passphrase", message: "Do you want to save the passphrase for later decryption?", preferredStyle: UIAlertControllerStyle.alert)
savePassphraseAlert.addAction(UIAlertAction(title: "No", style: UIAlertActionStyle.default) { _ in savePassphraseAlert.addAction(UIAlertAction(title: "No", style: UIAlertActionStyle.default) { _ in
Defaults[.isRememberPassphraseOn] = false Defaults[.isRememberPassphraseOn] = false
self.pgpPassphrase = nil
self.performSegue(withIdentifier: "savePGPKeySegue", sender: self) self.performSegue(withIdentifier: "savePGPKeySegue", sender: self)
}) })
savePassphraseAlert.addAction(UIAlertAction(title: "Save", style: UIAlertActionStyle.destructive) {_ in savePassphraseAlert.addAction(UIAlertAction(title: "Save", style: UIAlertActionStyle.destructive) {_ in

7
pass/Controllers/SettingsTableViewController.swift
View file

@ -34,7 +34,9 @@ class SettingsTableViewController: UITableViewController {
if let controller = segue.source as? PGPKeySettingTableViewController { if let controller = segue.source as? PGPKeySettingTableViewController {
Defaults[.pgpPrivateKeyURL] = URL(string: controller.pgpPrivateKeyURLTextField.text!) Defaults[.pgpPrivateKeyURL] = URL(string: controller.pgpPrivateKeyURLTextField.text!)
Defaults[.pgpPublicKeyURL] = URL(string: controller.pgpPublicKeyURLTextField.text!) Defaults[.pgpPublicKeyURL] = URL(string: controller.pgpPublicKeyURLTextField.text!)
self.passwordStore.pgpKeyPassphrase = controller.pgpPassphrase if Defaults[.isRememberPassphraseOn] {
self.passwordStore.pgpKeyPassphrase = controller.pgpPassphrase
}
Defaults[.pgpKeySource] = "url" Defaults[.pgpKeySource] = "url"
SVProgressHUD.setDefaultMaskType(.black) SVProgressHUD.setDefaultMaskType(.black)
@ -60,9 +62,8 @@ class SettingsTableViewController: UITableViewController {
} else if let controller = segue.source as? PGPKeyArmorSettingTableViewController { } else if let controller = segue.source as? PGPKeyArmorSettingTableViewController {
Defaults[.pgpKeySource] = "armor" Defaults[.pgpKeySource] = "armor"
self.passwordStore.pgpKeyPassphrase = controller.pgpPassphrase
if Defaults[.isRememberPassphraseOn] { if Defaults[.isRememberPassphraseOn] {
Utils.addPasswordToKeychain(name: "pgpKeyPassphrase", password: controller.pgpPassphrase!) self.passwordStore.pgpKeyPassphrase = controller.pgpPassphrase
} }
Defaults[.pgpPublicKeyArmor] = controller.armorPublicKeyTextView.text! Defaults[.pgpPublicKeyArmor] = controller.armorPublicKeyTextView.text!