diff --git a/.swiftlint.yml b/.swiftlint.yml index 5cb065e..32604df 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -125,7 +125,7 @@ whitelist_rules: - pattern_matching_keywords - prefer_self_type_over_type_of_self # - prefixed_toplevel_constant # Violations are mostly in test code. -# - private_action + - private_action # - private_outlet - private_over_fileprivate - private_unit_test diff --git a/pass/Controllers/AdvancedSettingsTableViewController.swift b/pass/Controllers/AdvancedSettingsTableViewController.swift index 4806d36..1da2090 100644 --- a/pass/Controllers/AdvancedSettingsTableViewController.swift +++ b/pass/Controllers/AdvancedSettingsTableViewController.swift @@ -85,7 +85,7 @@ class AdvancedSettingsTableViewController: UITableViewController { } @IBAction - func saveGitConfigSetting(segue: UIStoryboardSegue) { + private func saveGitConfigSetting(segue: UIStoryboardSegue) { if let controller = segue.source as? GitConfigSettingsTableViewController { if let gitSignatureName = controller.nameTextField.text, let gitSignatureEmail = controller.emailTextField.text { diff --git a/pass/Controllers/GitRepositorySettingsTableViewController.swift b/pass/Controllers/GitRepositorySettingsTableViewController.swift index 77780f9..955c754 100644 --- a/pass/Controllers/GitRepositorySettingsTableViewController.swift +++ b/pass/Controllers/GitRepositorySettingsTableViewController.swift @@ -110,7 +110,7 @@ class GitRepositorySettingsTableViewController: UITableViewController { // MARK: - Segue Handlers @IBAction - func save(_: Any) { + private func save(_: Any) { guard let gitURLTextFieldText = gitURLTextField.text, let gitURL = URL(string: gitURLTextFieldText.trimmed) else { Utils.alert(title: "CannotSave".localize(), message: "SetGitRepositoryUrl".localize(), controller: self) return @@ -224,7 +224,7 @@ class GitRepositorySettingsTableViewController: UITableViewController { } @IBAction - func importSSHKey(segue: UIStoryboardSegue) { + private func importSSHKey(segue: UIStoryboardSegue) { guard let sourceController = segue.source as? KeyImporter, sourceController.isReadyToUse() else { return } diff --git a/pass/Controllers/PGPKeyArmorImportTableViewController.swift b/pass/Controllers/PGPKeyArmorImportTableViewController.swift index abecf23..bea888a 100644 --- a/pass/Controllers/PGPKeyArmorImportTableViewController.swift +++ b/pass/Controllers/PGPKeyArmorImportTableViewController.swift @@ -33,7 +33,7 @@ class PGPKeyArmorImportTableViewController: AutoCellHeightUITableViewController, } @IBAction - func save(_: Any) { + private func save(_: Any) { armorPublicKey = armorPublicKeyTextView.text armorPrivateKey = armorPrivateKeyTextView.text saveImportedKeys() diff --git a/pass/Controllers/PGPKeyFIleImportTableViewController.swift b/pass/Controllers/PGPKeyFIleImportTableViewController.swift index ac16040..83da48e 100644 --- a/pass/Controllers/PGPKeyFIleImportTableViewController.swift +++ b/pass/Controllers/PGPKeyFIleImportTableViewController.swift @@ -19,7 +19,7 @@ class PGPKeyFileImportTableViewController: AutoCellHeightUITableViewController { private var currentlyPicking = KeyType.none @IBAction - func save(_: Any) { + private func save(_: Any) { saveImportedKeys() } diff --git a/pass/Controllers/PGPKeyUrlImportTableViewController.swift b/pass/Controllers/PGPKeyUrlImportTableViewController.swift index 7ada0d3..e3c3198 100644 --- a/pass/Controllers/PGPKeyUrlImportTableViewController.swift +++ b/pass/Controllers/PGPKeyUrlImportTableViewController.swift @@ -23,7 +23,7 @@ class PGPKeyUrlImportTableViewController: AutoCellHeightUITableViewController { } @IBAction - func save(_: Any) { + private func save(_: Any) { guard let publicKeyURLText = pgpPublicKeyURLTextField.text, let publicKeyURL = URL(string: publicKeyURLText), let privateKeyURLText = pgpPrivateKeyURLTextField.text, diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift index 1cad212..4ec3118 100644 --- a/pass/Controllers/PasswordDetailTableViewController.swift +++ b/pass/Controllers/PasswordDetailTableViewController.swift @@ -344,7 +344,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni } @IBAction - func back(segue _: UIStoryboardSegue) {} + private func back(segue _: UIStoryboardSegue) {} func getNextHOTP() { guard password != nil, passwordEntity != nil, password?.otpType == .hotp else { diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift index f62c6d4..c90ac53 100644 --- a/pass/Controllers/PasswordsViewController.swift +++ b/pass/Controllers/PasswordsViewController.swift @@ -137,10 +137,10 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV } @IBAction - func cancelAddPassword(segue _: UIStoryboardSegue) {} + private func cancelAddPassword(segue _: UIStoryboardSegue) {} @IBAction - func saveAddPassword(segue: UIStoryboardSegue) { + private func saveAddPassword(segue: UIStoryboardSegue) { if let controller = segue.source as? AddPasswordTableViewController { addPassword(password: controller.password!) } @@ -438,7 +438,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV } private func hideSectionHeader() -> Bool { - return passwordsTableEntries.count < Self.hideSectionHeaderThreshold || searchController.isActive + passwordsTableEntries.count < Self.hideSectionHeaderThreshold || searchController.isActive } func tableView(_: UITableView, titleForHeaderInSection section: Int) -> String? { diff --git a/pass/Controllers/SSHKeyArmorImportTableViewController.swift b/pass/Controllers/SSHKeyArmorImportTableViewController.swift index 0751aba..d927f63 100644 --- a/pass/Controllers/SSHKeyArmorImportTableViewController.swift +++ b/pass/Controllers/SSHKeyArmorImportTableViewController.swift @@ -60,7 +60,7 @@ class SSHKeyArmorImportTableViewController: AutoCellHeightUITableViewController, } @IBAction - func doneButtonTapped(_: Any) { + private func doneButtonTapped(_: Any) { armorPrivateKey = armorPrivateKeyTextView.text performSegue(withIdentifier: "importSSHKeySegue", sender: self) } diff --git a/pass/Controllers/SSHKeyFileImportTableViewController.swift b/pass/Controllers/SSHKeyFileImportTableViewController.swift index 4b6fb8f..2f283d1 100644 --- a/pass/Controllers/SSHKeyFileImportTableViewController.swift +++ b/pass/Controllers/SSHKeyFileImportTableViewController.swift @@ -15,7 +15,7 @@ class SSHKeyFileImportTableViewController: AutoCellHeightUITableViewController { private var privateKey: String? @IBAction - func doneButtonTapped(_: Any) { + private func doneButtonTapped(_: Any) { performSegue(withIdentifier: "importSSHKeySegue", sender: self) } diff --git a/pass/Controllers/SSHKeyUrlImportTableViewController.swift b/pass/Controllers/SSHKeyUrlImportTableViewController.swift index fa2f729..5ae7b25 100644 --- a/pass/Controllers/SSHKeyUrlImportTableViewController.swift +++ b/pass/Controllers/SSHKeyUrlImportTableViewController.swift @@ -20,7 +20,7 @@ class SSHKeyUrlImportTableViewController: AutoCellHeightUITableViewController { } @IBAction - func doneButtonTapped(_: UIButton) { + private func doneButtonTapped(_: UIButton) { guard let text = privateKeyURLTextField.text, let privateKeyURL = URL(string: text) else { Utils.alert(title: "CannotSave".localize(), message: "SetPrivateKeyUrl.".localize(), controller: self) diff --git a/pass/Controllers/SettingsTableViewController.swift b/pass/Controllers/SettingsTableViewController.swift index d756934..878a775 100644 --- a/pass/Controllers/SettingsTableViewController.swift +++ b/pass/Controllers/SettingsTableViewController.swift @@ -26,7 +26,7 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele } @IBAction - func savePGPKey(segue: UIStoryboardSegue) { + private func savePGPKey(segue: UIStoryboardSegue) { guard let sourceController = segue.source as? PGPKeyImporter, sourceController.isReadyToUse() else { return } @@ -60,7 +60,7 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele } @IBAction - func saveGitServerSetting(segue _: UIStoryboardSegue) { + private func saveGitServerSetting(segue _: UIStoryboardSegue) { passwordRepositoryTableViewCell.detailTextLabel?.text = Defaults.gitURL.host } diff --git a/pass/Views/FillPasswordTableViewCell.swift b/pass/Views/FillPasswordTableViewCell.swift index bfa07c0..d680987 100644 --- a/pass/Views/FillPasswordTableViewCell.swift +++ b/pass/Views/FillPasswordTableViewCell.swift @@ -32,18 +32,18 @@ class FillPasswordTableViewCell: UITableViewCell, ContentProvider { } @IBAction - func generatePassword(_: UIButton) { + private func generatePassword(_: UIButton) { delegate?.generateAndCopyPassword() } @IBAction - func showHidePasswordSettings() { + private func showHidePasswordSettings() { delegate?.showHidePasswordSettings() } // re-color @IBAction - func textFieldDidChange(_ sender: UITextField) { + private func textFieldDidChange(_ sender: UITextField) { contentTextField.attributedText = Utils.attributedPassword(plainPassword: sender.text ?? "") } diff --git a/pass/Views/SliderTableViewCell.swift b/pass/Views/SliderTableViewCell.swift index dd3af42..b1762f7 100644 --- a/pass/Views/SliderTableViewCell.swift +++ b/pass/Views/SliderTableViewCell.swift @@ -20,7 +20,7 @@ class SliderTableViewCell: UITableViewCell { private var delegate: PasswordSettingSliderTableViewCellDelegate! @IBAction - func handleSliderValueChange(_ sender: UISlider) { + private func handleSliderValueChange(_ sender: UISlider) { let newRoundedValue = Int(sender.value) // Proceed only if the rounded value gets updated. guard checker(newRoundedValue) else { diff --git a/pass/Views/SwitchTableViewCell.swift b/pass/Views/SwitchTableViewCell.swift index 772b273..e0314c3 100644 --- a/pass/Views/SwitchTableViewCell.swift +++ b/pass/Views/SwitchTableViewCell.swift @@ -18,7 +18,7 @@ class SwitchTableViewCell: UITableViewCell { private var delegate: PasswordSettingSliderTableViewCellDelegate! @IBAction - func switchValueChanged(_: Any) { + private func switchValueChanged(_: Any) { updater(controlSwitch.isOn) delegate.generateAndCopyPassword() } diff --git a/passAutoFillExtension/Controllers/CredentialProviderViewController.swift b/passAutoFillExtension/Controllers/CredentialProviderViewController.swift index 004bf83..07cc65b 100644 --- a/passAutoFillExtension/Controllers/CredentialProviderViewController.swift +++ b/passAutoFillExtension/Controllers/CredentialProviderViewController.swift @@ -83,7 +83,7 @@ class CredentialProviderViewController: ASCredentialProviderViewController, UITa */ @IBAction - func cancel(_: AnyObject?) { + private func cancel(_: AnyObject?) { extensionContext.cancelRequest(withError: NSError(domain: ASExtensionErrorDomain, code: ASExtensionError.userCanceled.rawValue)) } diff --git a/passExtension/Controllers/ExtensionViewController.swift b/passExtension/Controllers/ExtensionViewController.swift index 4362b0e..d33aab5 100644 --- a/passExtension/Controllers/ExtensionViewController.swift +++ b/passExtension/Controllers/ExtensionViewController.swift @@ -214,7 +214,7 @@ class ExtensionViewController: UIViewController, UITableViewDataSource, UITableV } @IBAction - func cancelExtension(_: Any) { + private func cancelExtension(_: Any) { extensionContext!.completeRequest(returningItems: [], completionHandler: nil) }