From 4034050ce0ad04146e83c7a4fe3c34d97186cf35 Mon Sep 17 00:00:00 2001 From: Evgeny Morozov Date: Thu, 23 Feb 2017 18:39:43 +0300 Subject: [PATCH] Fix a bug, that caused the app to crash if ssh passphrase is not set. --- pass/Controllers/SSHKeySettingTableViewController.swift | 2 +- pass/Controllers/SettingsTableViewController.swift | 2 +- pass/Models/PasswordStore.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pass/Controllers/SSHKeySettingTableViewController.swift b/pass/Controllers/SSHKeySettingTableViewController.swift index 4986a22..797d2d4 100644 --- a/pass/Controllers/SSHKeySettingTableViewController.swift +++ b/pass/Controllers/SSHKeySettingTableViewController.swift @@ -18,7 +18,7 @@ class SSHKeySettingTableViewController: UITableViewController { override func viewDidLoad() { super.viewDidLoad() - passphraseTextField.text = Utils.getPasswordFromKeychain(name: "gitRepositorySSHPrivateKeyPassphrase")! + passphraseTextField.text = Utils.getPasswordFromKeychain(name: "gitRepositorySSHPrivateKeyPassphrase") ?? "" privateKeyURLTextField.text = Defaults[.gitRepositorySSHPrivateKeyURL]?.absoluteString publicKeyURLTextField.text = Defaults[.gitRepositorySSHPublicKeyURL]?.absoluteString var doneBarButtonItem: UIBarButtonItem? diff --git a/pass/Controllers/SettingsTableViewController.swift b/pass/Controllers/SettingsTableViewController.swift index 4c72a09..ea4d7ec 100644 --- a/pass/Controllers/SettingsTableViewController.swift +++ b/pass/Controllers/SettingsTableViewController.swift @@ -116,7 +116,7 @@ class SettingsTableViewController: UITableViewController { gitCredential = GitCredential( credential: GitCredential.Credential.ssh( userName: username, - password: Utils.getPasswordFromKeychain(name: "gitRepositorySSHPrivateKeyPassphrase")!, + password: Utils.getPasswordFromKeychain(name: "gitRepositorySSHPrivateKeyPassphrase") ?? "", publicKeyFile: Globals.sshPublicKeyURL, privateKeyFile: Globals.sshPrivateKeyURL, passwordNotSetCallback: self.requestSshKeyPassword diff --git a/pass/Models/PasswordStore.swift b/pass/Models/PasswordStore.swift index 2034f16..2d53410 100644 --- a/pass/Models/PasswordStore.swift +++ b/pass/Models/PasswordStore.swift @@ -142,7 +142,7 @@ class PasswordStore { gitCredential = GitCredential( credential: GitCredential.Credential.ssh( userName: Defaults[.gitRepositoryUsername]!, - password: Utils.getPasswordFromKeychain(name: "gitRepositorySSHPrivateKeyPassphrase")!, + password: Utils.getPasswordFromKeychain(name: "gitRepositorySSHPrivateKeyPassphrase") ?? "", publicKeyFile: Globals.sshPublicKeyURL, privateKeyFile: Globals.sshPrivateKeyURL, passwordNotSetCallback: nil