diff --git a/pass/Controllers/GitRepositorySettingsTableViewController.swift b/pass/Controllers/GitRepositorySettingsTableViewController.swift index 2bd4fb3..fff34c0 100644 --- a/pass/Controllers/GitRepositorySettingsTableViewController.swift +++ b/pass/Controllers/GitRepositorySettingsTableViewController.swift @@ -122,7 +122,7 @@ class GitRepositorySettingsTableViewController: UITableViewController, PasswordA if let scheme = gitURL.scheme { switch scheme { - case "ssh", "http", "https": + case "http", "https", "ssh": if gitURL.user == nil && usernameTextField.text == nil { Utils.alert(title: "CannotSave".localize(), message: "CannotFindUsername.".localize(), controller: self) return diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift index b4bed81..64e5f53 100644 --- a/pass/Controllers/PasswordDetailTableViewController.swift +++ b/pass/Controllers/PasswordDetailTableViewController.swift @@ -425,7 +425,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni cell.categoryLabel.text = passwordEntity!.getCategoryText() cell.selectionStyle = .none return cell - case .main, .addition: + case .addition, .main: let cell = tableView.dequeueReusableCell(withIdentifier: "labelCell", for: indexPath) as! LabelTableViewCell let titleData = tableDataItem.title let contentData = tableDataItem.content @@ -487,7 +487,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni override func tableView(_: UITableView, canPerformAction action: Selector, forRowAt indexPath: IndexPath, withSender _: Any?) -> Bool { let section = tableData[indexPath.section] switch section.type { - case .main, .addition: + case .addition, .main: return action == #selector(UIResponderStandardEditActions.copy(_:)) default: return false diff --git a/pass/Controllers/PasswordEditorTableViewController.swift b/pass/Controllers/PasswordEditorTableViewController.swift index e648257..f4ddcbb 100644 --- a/pass/Controllers/PasswordEditorTableViewController.swift +++ b/pass/Controllers/PasswordEditorTableViewController.swift @@ -211,9 +211,9 @@ class PasswordEditorTableViewController: UITableViewController { override func tableView(_: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { switch tableData[indexPath.section][indexPath.row][PasswordEditorCellKey.type] as! PasswordEditorCellType { - case .passwordLengthCell, .passwordGroupsCell: + case .passwordGroupsCell, .passwordLengthCell: return 42 - case .passwordUseDigitsCell, .passwordVaryCasesCell, .passwordUseSpecialSymbols, .passwordFlavorCell: + case .passwordFlavorCell, .passwordUseDigitsCell, .passwordUseSpecialSymbols, .passwordVaryCasesCell: return 42 default: return UITableView.automaticDimension diff --git a/pass/Models/ScannableKeyType.swift b/pass/Models/ScannableKeyType.swift index 9009e9c..499db07 100644 --- a/pass/Models/ScannableKeyType.swift +++ b/pass/Models/ScannableKeyType.swift @@ -22,7 +22,7 @@ enum ScannableKeyType { var headerStart: String { switch self { - case .pgpPublic, .pgpPrivate: + case .pgpPrivate, .pgpPublic: return "-----BEGIN PGP \(visibility.uppercased()) KEY BLOCK-----" case .sshPrivate: return "-----BEGIN" @@ -31,7 +31,7 @@ enum ScannableKeyType { var footerStart: String { switch self { - case .pgpPublic, .pgpPrivate: + case .pgpPrivate, .pgpPublic: return "-----END PGP \(visibility.uppercased())" case .sshPrivate: return "-----END" @@ -40,7 +40,7 @@ enum ScannableKeyType { var footerEnd: String { switch self { - case .pgpPublic, .pgpPrivate: + case .pgpPrivate, .pgpPublic: return "KEY BLOCK-----" case .sshPrivate: return "KEY-----" diff --git a/passKit/Controllers/PasscodeLockViewController.swift b/passKit/Controllers/PasscodeLockViewController.swift index b668829..9d175ce 100644 --- a/passKit/Controllers/PasscodeLockViewController.swift +++ b/passKit/Controllers/PasscodeLockViewController.swift @@ -192,7 +192,7 @@ open class PasscodeLockViewController: UIViewController, UITextFieldDelegate { UIAlertAction(title: "ErasePasswordStoreData".localize(), style: UIAlertAction.Style.destructive) { [unowned self] _ -> Void in let myContext = LAContext() // If the device passcode is not set, reset the app. - guard myContext.canEvaluatePolicy(.deviceOwnerAuthentication, error: nil)else { + guard myContext.canEvaluatePolicy(.deviceOwnerAuthentication, error: nil) else { self.passwordStore.erase() self.passcodeLockDidSucceed() return diff --git a/passKit/Helpers/AppError.swift b/passKit/Helpers/AppError.swift index 86fa4d9..11a8f8f 100644 --- a/passKit/Helpers/AppError.swift +++ b/passKit/Helpers/AppError.swift @@ -33,9 +33,9 @@ extension AppError: LocalizedError { let enumName = String(describing: self) let localizationKey = "\(enumName.first!.uppercased())\(enumName.dropFirst().prefix { $0 != "(" })Error." switch self { - case let .repositoryRemoteBranchNotFound(name), let .repositoryBranchNotFound(name), let .readingFile(name): + case let .readingFile(name), let .repositoryBranchNotFound(name), let .repositoryRemoteBranchNotFound(name): return localizationKey.localize(name) - case let .pgpPublicKeyNotFound(keyID), let .pgpPrivateKeyNotFound(keyID): + case let .pgpPrivateKeyNotFound(keyID), let .pgpPublicKeyNotFound(keyID): return localizationKey.localize(keyID) default: return localizationKey.localize()