From 4a9ec89a6cb2d6c68af57880ae034ba3cbfc20aa Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Wed, 22 Mar 2017 17:42:37 -0700 Subject: [PATCH] Check illegal character before adding a new password --- .../AddPasswordTableViewController.swift | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pass/Controllers/AddPasswordTableViewController.swift b/pass/Controllers/AddPasswordTableViewController.swift index 423cac7..c4259fe 100644 --- a/pass/Controllers/AddPasswordTableViewController.swift +++ b/pass/Controllers/AddPasswordTableViewController.swift @@ -25,20 +25,29 @@ class AddPasswordTableViewController: PasswordEditorTableViewController { override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool { if identifier == "saveAddPasswordSegue" { // check PGP key - if passwordStore.privateKey == nil { + guard passwordStore.privateKey != nil else { let alertTitle = "Cannot Add Password" let alertMessage = "PGP Key is not set. Please set your PGP Key first." Utils.alert(title: alertTitle, message: alertMessage, controller: self, completion: nil) return false } + // check name let nameCell = tableView.cellForRow(at: IndexPath(row: 0, section: 0)) as! TextFieldTableViewCell - if nameCell.getContent()!.isEmpty { + guard nameCell.getContent()!.isEmpty == false else { let alertTitle = "Cannot Add Password" let alertMessage = "Please fill in the name." Utils.alert(title: alertTitle, message: alertMessage, controller: self, completion: nil) return false } + + // check "/" + guard nameCell.getContent()!.contains("/") == false else { + let alertTitle = "Cannot Add Password" + let alertMessage = "Illegal character." + Utils.alert(title: alertTitle, message: alertMessage, controller: self, completion: nil) + return false + } } return true }