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

Fix bugs may introduce crashes

Browse source
This commit is contained in:
Bob Sun 2017-04-23 10:16:50 -07:00
parent 914f072ab2
commit ee077bf026
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pass/Models/PasswordStore.swift
View file

@ -71,7 +71,7 @@ struct GitCredential {
let encrypted = try? String(contentsOf: privateKeyFile).contains("ENCRYPTED") let encrypted = try? String(contentsOf: privateKeyFile).contains("ENCRYPTED")
// Request password if not already set // Request password if not already set
if encrypted! && password == "" { if encrypted == nil && password == "" {
newPassword = passwordNotSetCallback!() newPassword = passwordNotSetCallback!()
} }
@ -112,8 +112,8 @@ class PasswordStore {
var gitSignatureForNow: GTSignature { var gitSignatureForNow: GTSignature {
get { get {
let name = Defaults[.gitName] ?? Defaults[.gitUsername]! let name = Defaults[.gitName] ?? Defaults[.gitUsername] ?? ""
let email = Defaults[.gitEmail] ?? (Defaults[.gitUsername]!+"@passforios") let email = Defaults[.gitEmail] ?? (Defaults[.gitUsername] ?? "" + "@passforios")
return GTSignature(name: name, email: email, time: Date())! return GTSignature(name: name, email: email, time: Date())!
} }
} }
@ -184,11 +184,11 @@ class PasswordStore {
public func initGitCredential() { public func initGitCredential() {
if Defaults[.gitAuthenticationMethod] == "Password" { if Defaults[.gitAuthenticationMethod] == "Password" {
gitCredential = GitCredential(credential: GitCredential.Credential.http(userName: Defaults[.gitUsername]!, password: Utils.getPasswordFromKeychain(name: "gitPassword") ?? "")) gitCredential = GitCredential(credential: GitCredential.Credential.http(userName: Defaults[.gitUsername] ?? "", password: Utils.getPasswordFromKeychain(name: "gitPassword") ?? ""))
} else if Defaults[.gitAuthenticationMethod] == "SSH Key"{ } else if Defaults[.gitAuthenticationMethod] == "SSH Key"{
gitCredential = GitCredential( gitCredential = GitCredential(
credential: GitCredential.Credential.ssh( credential: GitCredential.Credential.ssh(
userName: Defaults[.gitUsername]!, userName: Defaults[.gitUsername] ?? "",
password: gitSSHPrivateKeyPassphrase ?? "", password: gitSSHPrivateKeyPassphrase ?? "",
publicKeyFile: Globals.gitSSHPublicKeyURL, publicKeyFile: Globals.gitSSHPublicKeyURL,
privateKeyFile: Globals.gitSSHPrivateKeyURL, privateKeyFile: Globals.gitSSHPrivateKeyURL,