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

Fix a bug, that caused the app to crash if ssh passphrase is not set.

Browse source
This commit is contained in:
Evgeny Morozov 2017-02-23 18:39:43 +03:00
parent 586e86052b
commit 4034050ce0
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pass/Controllers/SSHKeySettingTableViewController.swift
View file

@ -18,7 +18,7 @@ class SSHKeySettingTableViewController: UITableViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
passphraseTextField.text = Utils.getPasswordFromKeychain(name: "gitRepositorySSHPrivateKeyPassphrase")! passphraseTextField.text = Utils.getPasswordFromKeychain(name: "gitRepositorySSHPrivateKeyPassphrase") ?? ""
privateKeyURLTextField.text = Defaults[.gitRepositorySSHPrivateKeyURL]?.absoluteString privateKeyURLTextField.text = Defaults[.gitRepositorySSHPrivateKeyURL]?.absoluteString
publicKeyURLTextField.text = Defaults[.gitRepositorySSHPublicKeyURL]?.absoluteString publicKeyURLTextField.text = Defaults[.gitRepositorySSHPublicKeyURL]?.absoluteString
var doneBarButtonItem: UIBarButtonItem? var doneBarButtonItem: UIBarButtonItem?

2
pass/Controllers/SettingsTableViewController.swift
View file

@ -116,7 +116,7 @@ class SettingsTableViewController: UITableViewController {
gitCredential = GitCredential( gitCredential = GitCredential(
credential: GitCredential.Credential.ssh( credential: GitCredential.Credential.ssh(
userName: username, userName: username,
password: Utils.getPasswordFromKeychain(name: "gitRepositorySSHPrivateKeyPassphrase")!, password: Utils.getPasswordFromKeychain(name: "gitRepositorySSHPrivateKeyPassphrase") ?? "",
publicKeyFile: Globals.sshPublicKeyURL, publicKeyFile: Globals.sshPublicKeyURL,
privateKeyFile: Globals.sshPrivateKeyURL, privateKeyFile: Globals.sshPrivateKeyURL,
passwordNotSetCallback: self.requestSshKeyPassword passwordNotSetCallback: self.requestSshKeyPassword

2
pass/Models/PasswordStore.swift
View file

@ -142,7 +142,7 @@ class PasswordStore {
gitCredential = GitCredential( gitCredential = GitCredential(
credential: GitCredential.Credential.ssh( credential: GitCredential.Credential.ssh(
userName: Defaults[.gitRepositoryUsername]!, userName: Defaults[.gitRepositoryUsername]!,
password: Utils.getPasswordFromKeychain(name: "gitRepositorySSHPrivateKeyPassphrase")!, password: Utils.getPasswordFromKeychain(name: "gitRepositorySSHPrivateKeyPassphrase") ?? "",
publicKeyFile: Globals.sshPublicKeyURL, publicKeyFile: Globals.sshPublicKeyURL,
privateKeyFile: Globals.sshPrivateKeyURL, privateKeyFile: Globals.sshPrivateKeyURL,
passwordNotSetCallback: nil passwordNotSetCallback: nil