From 7effaa841af1007b4247b82e2966bb2829fdec45 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Wed, 8 Feb 2017 19:31:42 +0800
Subject: [PATCH] change sshPublicKeyPath to sshPublicKeyURL

---
 pass/Globals.swift                          | 4 ++--
 pass/PasswordStore.swift                    | 6 +++---
 pass/SSHKeySettingTableViewController.swift | 4 ++--
 pass/SettingsTableViewController.swift      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pass/Globals.swift b/pass/Globals.swift
index 23111cf..2d75935 100644
--- a/pass/Globals.swift
+++ b/pass/Globals.swift
@@ -11,8 +11,8 @@ import Foundation
 class Globals {
     static let documentPath = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)[0];
     static let secringPath = "\(documentPath)/secring.gpg"
-    static let sshPublicKeyPath = URL(fileURLWithPath: "\(documentPath)/ssh_key.pub")
-    static let sshPrivateKeyPath = URL(fileURLWithPath: "\(documentPath)/ssh_key")
+    static let sshPublicKeyURL = URL(fileURLWithPath: "\(documentPath)/ssh_key.pub")
+    static let sshPrivateKeyURL = URL(fileURLWithPath: "\(documentPath)/ssh_key")
     static var passcodeConfiguration = PasscodeLockConfiguration()
     private init() { }
 }
diff --git a/pass/PasswordStore.swift b/pass/PasswordStore.swift
index 28cee59..0784923 100644
--- a/pass/PasswordStore.swift
+++ b/pass/PasswordStore.swift
@@ -63,7 +63,7 @@ class PasswordStore {
         if Defaults[.gitRepositoryAuthenticationMethod] == "Password" {
             gitCredential = GitCredential(credential: GitCredential.Credential.http(userName: Defaults[.gitRepositoryUsername], password: Defaults[.gitRepositoryPassword]))
         } else if Defaults[.gitRepositoryAuthenticationMethod] == "SSH Key"{
-            gitCredential = GitCredential(credential: GitCredential.Credential.ssh(userName: Defaults[.gitRepositoryUsername], password: Defaults[.gitRepositorySSHPrivateKeyPassphrase]!, publicKeyFile: Globals.sshPublicKeyPath, privateKeyFile: Globals.sshPrivateKeyPath))
+            gitCredential = GitCredential(credential: GitCredential.Credential.ssh(userName: Defaults[.gitRepositoryUsername], password: Defaults[.gitRepositorySSHPrivateKeyPassphrase]!, publicKeyFile: Globals.sshPublicKeyURL, privateKeyFile: Globals.sshPrivateKeyURL))
         } else {
             gitCredential = nil
         }
@@ -186,8 +186,8 @@ class PasswordStore {
     func erase() {
         Utils.removeFileIfExists(at: storeURL)
         Utils.removeFileIfExists(atPath: Globals.secringPath)
-        Utils.removeFileIfExists(at: Globals.sshPrivateKeyPath)
-        Utils.removeFileIfExists(at: Globals.sshPublicKeyPath)
+        Utils.removeFileIfExists(at: Globals.sshPrivateKeyURL)
+        Utils.removeFileIfExists(at: Globals.sshPublicKeyURL)
         
         deleteCoreData(entityName: "PasswordEntity")
         deleteCoreData(entityName: "PasswordCategoryEntity")
diff --git a/pass/SSHKeySettingTableViewController.swift b/pass/SSHKeySettingTableViewController.swift
index 1cfb779..1758908 100644
--- a/pass/SSHKeySettingTableViewController.swift
+++ b/pass/SSHKeySettingTableViewController.swift
@@ -36,8 +36,8 @@ class SSHKeySettingTableViewController: UITableViewController {
         Defaults[.gitRepositorySSHPrivateKeyPassphrase] = passphraseTextField.text!
         
         do {
-            try Data(contentsOf: Defaults[.gitRepositorySSHPublicKeyURL]!).write(to: Globals.sshPublicKeyPath, options: .atomic)
-            try Data(contentsOf: Defaults[.gitRepositorySSHPrivateKeyURL]!).write(to: Globals.sshPrivateKeyPath, options: .atomic)
+            try Data(contentsOf: Defaults[.gitRepositorySSHPublicKeyURL]!).write(to: Globals.sshPublicKeyURL, options: .atomic)
+            try Data(contentsOf: Defaults[.gitRepositorySSHPrivateKeyURL]!).write(to: Globals.sshPrivateKeyURL, options: .atomic)
         } catch {
             print(error)
         }
diff --git a/pass/SettingsTableViewController.swift b/pass/SettingsTableViewController.swift
index 9fac3d9..00ddd14 100644
--- a/pass/SettingsTableViewController.swift
+++ b/pass/SettingsTableViewController.swift
@@ -37,7 +37,7 @@ class SettingsTableViewController: UITableViewController {
                 if auth == "Password" {
                     gitCredential = GitCredential(credential: GitCredential.Credential.http(userName: username, password: password))
                 } else {
-                    gitCredential = GitCredential(credential: GitCredential.Credential.ssh(userName: username, password: Defaults[.gitRepositorySSHPrivateKeyPassphrase]!, publicKeyFile: Globals.sshPublicKeyPath, privateKeyFile: Globals.sshPrivateKeyPath))
+                    gitCredential = GitCredential(credential: GitCredential.Credential.ssh(userName: username, password: Defaults[.gitRepositorySSHPrivateKeyPassphrase]!, publicKeyFile: Globals.sshPublicKeyURL, privateKeyFile: Globals.sshPrivateKeyURL))
                 }
 
                 DispatchQueue.global(qos: .userInitiated).async {