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

Correct git signature logic

Browse source
This commit is contained in:
Bob Sun 2017-04-27 22:48:11 -07:00
parent 2f790d7923
commit 649d709369
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
6 changed files with 28 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pass/Controllers/GitConfigSettingTableViewController.swift
View file

@ -22,22 +22,16 @@ class GitConfigSettingTableViewController: UITableViewController {
let signature = passwordStore.gitSignatureForNow
nameTextField.placeholder = signature.name
emailTextField.placeholder = signature.email
if let gitConfigUserName = Defaults[.gitConfigUserName],
let gitConfigUserEmail = Defaults[.gitConfigUserEmail] {
nameTextField.text = gitConfigUserName
emailTextField.text = gitConfigUserEmail
}
nameTextField.text = Defaults[.gitSignatureName]
emailTextField.text = Defaults[.gitSignatureEmail]
}
override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
if identifier == "saveGitConfigSettingSegue" {
guard let name = nameTextField.text?.trimmingCharacters(in: .whitespaces), !name.isEmpty else {
Utils.alert(title: "Cannot Save", message: "Please set name first.", controller: self, completion: nil)
return false
}
guard let email = emailTextField.text?.trimmingCharacters(in: .whitespaces), !email.isEmpty else {
Utils.alert(title: "Cannot Save", message: "Please set email first.", controller: self, completion: nil)
let name = nameTextField.text!.isEmpty ? Globals.gitSignatureDefaultName : nameTextField.text!
let email = emailTextField.text!.isEmpty ? Globals.gitSignatureDefaultEmail : nameTextField.text!
guard GTSignature(name: name, email: email, time: nil) != nil else {
Utils.alert(title: "Error", message: "Invalid name or email.", controller: self, completion: nil)
return false
}
}