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

Give an default authentication method to avoid crashes

Browse source
This commit is contained in:
Bob Sun 2017-05-01 23:06:39 -04:00
parent 53ea744bb6
commit c2562d31d1
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pass/Controllers/GitServerSettingTableViewController.swift
View file

@ -19,7 +19,7 @@ class GitServerSettingTableViewController: UITableViewController {
let passwordStore = PasswordStore.shared let passwordStore = PasswordStore.shared
var sshLabel: UILabel? = nil var sshLabel: UILabel? = nil
var authenticationMethod = Defaults[.gitAuthenticationMethod] var authenticationMethod = Defaults[.gitAuthenticationMethod] ?? "Password"
private func checkAuthenticationMethod(method: String) { private func checkAuthenticationMethod(method: String) {
let passwordCheckView = authPasswordCell.viewWithTag(1001)! let passwordCheckView = authPasswordCell.viewWithTag(1001)!
@ -51,9 +51,8 @@ class GitServerSettingTableViewController: UITableViewController {
gitURLTextField.text = url.absoluteString gitURLTextField.text = url.absoluteString
} }
usernameTextField.text = Defaults[.gitUsername] usernameTextField.text = Defaults[.gitUsername]
authenticationMethod = Defaults[.gitAuthenticationMethod]
checkAuthenticationMethod(method: authenticationMethod!) checkAuthenticationMethod(method: authenticationMethod)
authSSHKeyCell.accessoryType = .detailButton authSSHKeyCell.accessoryType = .detailButton
} }
@ -80,10 +79,6 @@ class GitServerSettingTableViewController: UITableViewController {
Utils.alert(title: "Cannot Save", message: "Git Server is not set.", controller: self, completion: nil) Utils.alert(title: "Cannot Save", message: "Git Server is not set.", controller: self, completion: nil)
return false return false
} }
guard authenticationMethod != nil else {
Utils.alert(title: "Cannot Save", message: "Authentication method is not set.", controller: self, completion: nil)
return false
}
} }
return true return true
} }
@ -101,7 +96,7 @@ class GitServerSettingTableViewController: UITableViewController {
authenticationMethod = "SSH Key" authenticationMethod = "SSH Key"
} }
} }
checkAuthenticationMethod(method: authenticationMethod!) checkAuthenticationMethod(method: authenticationMethod)
tableView.deselectRow(at: indexPath, animated: true) tableView.deselectRow(at: indexPath, animated: true)
} }