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

add PGP key url check

Browse source
This commit is contained in:
Bob Sun 2017-02-06 13:25:27 +08:00
parent 27c12abdc4
commit 6e5f6d9360
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
3 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pass/Base.lproj/Main.storyboard
View file

@ -485,7 +485,7 @@
</barButtonItem> </barButtonItem>
<barButtonItem key="rightBarButtonItem" systemItem="done" id="TNt-ne-l7W"> <barButtonItem key="rightBarButtonItem" systemItem="done" id="TNt-ne-l7W">
<connections> <connections>
<segue destination="jjl-Xi-fkn" kind="unwind" unwindAction="saveWithSegue:" id="aKP-AF-lfv"/> <segue destination="jjl-Xi-fkn" kind="unwind" identifier="savePGPKeySegue" unwindAction="saveWithSegue:" id="aKP-AF-lfv"/>
</connections> </connections>
</barButtonItem> </barButtonItem>
</navigationItem> </navigationItem>

13
pass/PGPKeySettingTableViewController.swift
View file

@ -19,4 +19,17 @@ class PGPKeySettingTableViewController: UITableViewController {
pgpKeyURLTextField.text = Defaults[.pgpKeyURL]?.absoluteString pgpKeyURLTextField.text = Defaults[.pgpKeyURL]?.absoluteString
pgpKeyPassphraseTextField.text = Defaults[.pgpKeyPassphrase] pgpKeyPassphraseTextField.text = Defaults[.pgpKeyPassphrase]
} }
override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
if identifier == "savePGPKeySegue" {
if URL(string: pgpKeyURLTextField.text!)!.scheme! == "http" {
let alertMessage = "HTTP connection is not supported."
let alert = UIAlertController(title: "Cannot Save Settings", message: alertMessage, preferredStyle: UIAlertControllerStyle.alert)
alert.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.default, handler: nil))
self.present(alert, animated: true, completion: nil)
return false
}
}
return true
}
} }

4
pass/SettingsTableViewController.swift
View file

@ -75,9 +75,9 @@ class SettingsTableViewController: UITableViewController {
} }
} }
} else if let controller = segue.source as? PGPKeySettingTableViewController { } else if let controller = segue.source as? PGPKeySettingTableViewController {
if Defaults[.pgpKeyURL] != URL(string: controller.pgpKeyURLTextField.text!) || if Defaults[.pgpKeyURL] != URL(string: controller.pgpKeyURLTextField.text!) ||
Defaults[.pgpKeyPassphrase] != controller.pgpKeyPassphraseTextField.text! Defaults[.pgpKeyPassphrase] != controller.pgpKeyPassphraseTextField.text! {
{
Defaults[.pgpKeyURL] = URL(string: controller.pgpKeyURLTextField.text!) Defaults[.pgpKeyURL] = URL(string: controller.pgpKeyURLTextField.text!)
Defaults[.pgpKeyPassphrase] = controller.pgpKeyPassphraseTextField.text! Defaults[.pgpKeyPassphrase] = controller.pgpKeyPassphraseTextField.text!