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

Remove optional arguments and qualified names

Browse source
This commit is contained in:
Danny Moesch 2020-02-09 22:43:21 +01:00 • committed by Mingshen Sun
parent 43bba1fb50
commit a5570a8409
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pass/Controllers/PGPKeyArmorSettingTableViewController.swift
View file

@ -157,6 +157,6 @@ extension PGPKeyArmorSettingTableViewController: PGPKeyImporter {
} }
func saveImportedKeys() { func saveImportedKeys() {
self.performSegue(withIdentifier: "savePGPKeySegue", sender: self) performSegue(withIdentifier: "savePGPKeySegue", sender: self)
} }
} }

2
pass/Controllers/PGPKeyFileSettingTableViewController.swift
View file

@ -91,7 +91,7 @@ extension PGPKeyFileSettingTableViewController: PGPKeyImporter {
} }
func saveImportedKeys() { func saveImportedKeys() {
self.performSegue(withIdentifier: "savePGPKeySegue", sender: self) performSegue(withIdentifier: "savePGPKeySegue", sender: self)
} }
private func validate(key: String?) -> Bool { private func validate(key: String?) -> Bool {

16
pass/Controllers/PGPKeyImporter.swift
View file

@ -38,28 +38,28 @@ extension PGPKeyImporter {
extension PGPKeyImporter where Self: UIViewController { extension PGPKeyImporter where Self: UIViewController {
func savePassphraseDialog() { func savePassphraseDialog() {
let savePassphraseAlert = UIAlertController(title: "Passphrase".localize(), message: "WantToSavePassphrase?".localize(), preferredStyle: UIAlertController.Style.alert) let savePassphraseAlert = UIAlertController(title: "Passphrase".localize(), message: "WantToSavePassphrase?".localize(), preferredStyle: .alert)
// Do not save the key's passphrase. // Do not save the key's passphrase.
savePassphraseAlert.addAction(UIAlertAction(title: "No".localize(), style: UIAlertAction.Style.default) { _ in savePassphraseAlert.addAction(UIAlertAction(title: "No".localize(), style: .default) { _ in
AppKeychain.shared.removeContent(for: Globals.pgpKeyPassphrase) AppKeychain.shared.removeContent(for: Globals.pgpKeyPassphrase)
Defaults.isRememberPGPPassphraseOn = false Defaults.isRememberPGPPassphraseOn = false
self.saveImportedKeys() self.saveImportedKeys()
}) })
// Save the key's passphrase. // Save the key's passphrase.
savePassphraseAlert.addAction(UIAlertAction(title: "Yes".localize(), style: UIAlertAction.Style.destructive) {_ in savePassphraseAlert.addAction(UIAlertAction(title: "Yes".localize(), style: .destructive) { _ in
// Ask for the passphrase. // Ask for the passphrase.
let alert = UIAlertController(title: "Passphrase".localize(), message: "FillInPgpPassphrase.".localize(), preferredStyle: UIAlertController.Style.alert) let alert = UIAlertController(title: "Passphrase".localize(), message: "FillInPgpPassphrase.".localize(), preferredStyle: .alert)
alert.addAction(UIAlertAction(title: "Ok".localize(), style: UIAlertAction.Style.default, handler: {_ in alert.addAction(UIAlertAction(title: "Ok".localize(), style: .default) { _ in
AppKeychain.shared.add(string: alert.textFields?.first?.text, for: Globals.pgpKeyPassphrase) AppKeychain.shared.add(string: alert.textFields?.first?.text, for: Globals.pgpKeyPassphrase)
Defaults.isRememberPGPPassphraseOn = true Defaults.isRememberPGPPassphraseOn = true
self.saveImportedKeys() self.saveImportedKeys()
})) })
alert.addTextField { textField in alert.addTextField { textField in
textField.text = AppKeychain.shared.get(for: Globals.pgpKeyPassphrase) textField.text = AppKeychain.shared.get(for: Globals.pgpKeyPassphrase)
textField.isSecureTextEntry = true textField.isSecureTextEntry = true
} }
self.present(alert, animated: true, completion: nil) self.present(alert, animated: true)
}) })
self.present(savePassphraseAlert, animated: true, completion: nil) present(savePassphraseAlert, animated: true)
} }
} }

8
pass/Controllers/PGPKeyUrlTableViewController.swift
View file

@ -47,20 +47,20 @@ extension PGPKeyUrlTableViewController: PGPKeyImporter {
} }
func doAfterImport() { func doAfterImport() {
Utils.alert(title: "RememberToRemoveKey".localize(), message: "RememberToRemoveKeyFromServer.".localize(), controller: self, completion: nil) Utils.alert(title: "RememberToRemoveKey".localize(), message: "RememberToRemoveKeyFromServer.".localize(), controller: self)
} }
func saveImportedKeys() { func saveImportedKeys() {
self.performSegue(withIdentifier: "savePGPKeySegue", sender: self) performSegue(withIdentifier: "savePGPKeySegue", sender: self)
} }
private func validate(pgpKeyUrl: String?) -> Bool { private func validate(pgpKeyUrl: String?) -> Bool {
guard let pgpKeyUrl = pgpKeyUrl, let url = URL(string: pgpKeyUrl), let scheme = url.scheme else { guard let pgpKeyUrl = pgpKeyUrl, let url = URL(string: pgpKeyUrl), let scheme = url.scheme else {
Utils.alert(title: "CannotSavePgpKey".localize(), message: "SetPgpKeyUrlFirst.".localize(), controller: self, completion: nil) Utils.alert(title: "CannotSavePgpKey".localize(), message: "SetPgpKeyUrlFirst.".localize(), controller: self)
return false return false
} }
guard scheme == "https" else { guard scheme == "https" else {
Utils.alert(title: "CannotSavePgpKey".localize(), message: "UseHttps.".localize(), controller: self, completion: nil) Utils.alert(title: "CannotSavePgpKey".localize(), message: "UseHttps.".localize(), controller: self)
return false return false
} }
return true return true