From a5570a8409b7950659e0de680382478040940fdb Mon Sep 17 00:00:00 2001 From: Danny Moesch Date: Sun, 9 Feb 2020 22:43:21 +0100 Subject: [PATCH] Remove optional arguments and qualified names --- .../PGPKeyArmorSettingTableViewController.swift | 2 +- .../PGPKeyFileSettingTableViewController.swift | 2 +- pass/Controllers/PGPKeyImporter.swift | 16 ++++++++-------- .../PGPKeyUrlTableViewController.swift | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pass/Controllers/PGPKeyArmorSettingTableViewController.swift b/pass/Controllers/PGPKeyArmorSettingTableViewController.swift index 3de63ac..3280265 100644 --- a/pass/Controllers/PGPKeyArmorSettingTableViewController.swift +++ b/pass/Controllers/PGPKeyArmorSettingTableViewController.swift @@ -157,6 +157,6 @@ extension PGPKeyArmorSettingTableViewController: PGPKeyImporter { } func saveImportedKeys() { - self.performSegue(withIdentifier: "savePGPKeySegue", sender: self) + performSegue(withIdentifier: "savePGPKeySegue", sender: self) } } diff --git a/pass/Controllers/PGPKeyFileSettingTableViewController.swift b/pass/Controllers/PGPKeyFileSettingTableViewController.swift index 166ded5..e8d975a 100644 --- a/pass/Controllers/PGPKeyFileSettingTableViewController.swift +++ b/pass/Controllers/PGPKeyFileSettingTableViewController.swift @@ -91,7 +91,7 @@ extension PGPKeyFileSettingTableViewController: PGPKeyImporter { } func saveImportedKeys() { - self.performSegue(withIdentifier: "savePGPKeySegue", sender: self) + performSegue(withIdentifier: "savePGPKeySegue", sender: self) } private func validate(key: String?) -> Bool { diff --git a/pass/Controllers/PGPKeyImporter.swift b/pass/Controllers/PGPKeyImporter.swift index aa6e6e3..389e157 100644 --- a/pass/Controllers/PGPKeyImporter.swift +++ b/pass/Controllers/PGPKeyImporter.swift @@ -38,28 +38,28 @@ extension PGPKeyImporter { extension PGPKeyImporter where Self: UIViewController { 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. - 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) Defaults.isRememberPGPPassphraseOn = false self.saveImportedKeys() }) // 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. - let alert = UIAlertController(title: "Passphrase".localize(), message: "FillInPgpPassphrase.".localize(), preferredStyle: UIAlertController.Style.alert) - alert.addAction(UIAlertAction(title: "Ok".localize(), style: UIAlertAction.Style.default, handler: {_ in + let alert = UIAlertController(title: "Passphrase".localize(), message: "FillInPgpPassphrase.".localize(), preferredStyle: .alert) + alert.addAction(UIAlertAction(title: "Ok".localize(), style: .default) { _ in AppKeychain.shared.add(string: alert.textFields?.first?.text, for: Globals.pgpKeyPassphrase) Defaults.isRememberPGPPassphraseOn = true self.saveImportedKeys() - })) + }) alert.addTextField { textField in textField.text = AppKeychain.shared.get(for: Globals.pgpKeyPassphrase) 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) } } diff --git a/pass/Controllers/PGPKeyUrlTableViewController.swift b/pass/Controllers/PGPKeyUrlTableViewController.swift index c42ed20..06c5072 100644 --- a/pass/Controllers/PGPKeyUrlTableViewController.swift +++ b/pass/Controllers/PGPKeyUrlTableViewController.swift @@ -47,20 +47,20 @@ extension PGPKeyUrlTableViewController: PGPKeyImporter { } 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() { - self.performSegue(withIdentifier: "savePGPKeySegue", sender: self) + performSegue(withIdentifier: "savePGPKeySegue", sender: self) } private func validate(pgpKeyUrl: String?) -> Bool { 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 } 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 true