From 90bc399c9fe17570bfea91037be6d372237e5aae Mon Sep 17 00:00:00 2001
From: Mingshen Sun <bob@mssun.me>
Date: Wed, 17 Jul 2019 23:43:28 -0700
Subject: [PATCH] Fix a bug when importing SSH Key from URL

---
 pass/Base.lproj/Main.storyboard                        |  6 +++---
 .../Controllers/SSHKeySettingTableViewController.swift | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard
index 19da3a5..a969437 100644
--- a/pass/Base.lproj/Main.storyboard
+++ b/pass/Base.lproj/Main.storyboard
@@ -1689,7 +1689,7 @@ Secret Question 1: What is your childhood best friend's most bizarre superhero f
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="scanner output" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U8O-Md-w8e">
-                                <rect key="frame" x="57" y="518" width="300" height="45"/>
+                                <rect key="frame" x="57" y="562" width="300" height="45"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.5" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="300" id="JcM-Sy-Hw8"/>
@@ -1775,8 +1775,8 @@ Secret Question 1: What is your childhood best friend's most bizarre superhero f
         <image name="Settings" width="25" height="25"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="QFy-OX-cAa"/>
-        <segue reference="oxP-I1-Mke"/>
+        <segue reference="wCk-aN-a4J"/>
+        <segue reference="5iZ-y9-FCH"/>
         <segue reference="yyD-4H-pLE"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/pass/Controllers/SSHKeySettingTableViewController.swift b/pass/Controllers/SSHKeySettingTableViewController.swift
index 2e542bb..c344d9f 100644
--- a/pass/Controllers/SSHKeySettingTableViewController.swift
+++ b/pass/Controllers/SSHKeySettingTableViewController.swift
@@ -17,20 +17,20 @@ class SSHKeySettingTableViewController: AutoCellHeightUITableViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        privateKeyURLTextField.text = SharedDefaults[.gitSSHPrivateKeyURL]?.absoluteString
     }
 
-
     @IBAction func doneButtonTapped(_ sender: UIButton) {
         guard let privateKeyURL = URL(string: privateKeyURLTextField.text!.trimmed) else {
             Utils.alert(title: "CannotSave".localize(), message: "SetPrivateKeyUrl.".localize(), controller: self, completion: nil)
             return
         }
 
-        SharedDefaults[.gitSSHPrivateKeyURL] = privateKeyURL
-
         do {
-            try Data(contentsOf: privateKeyURL).write(to: URL(fileURLWithPath: Globals.gitSSHPrivateKeyPath), options: .atomic)
+            try Data(contentsOf: privateKeyURL).write(to: URL(fileURLWithPath: SshKey.PRIVATE.getFileSharingPath()), options: .atomic)
+            try self.passwordStore.gitSSHKeyImportFromFileSharing()
+            SharedDefaults[.gitSSHKeySource] = "file"
+            SVProgressHUD.showSuccess(withStatus: "Imported".localize())
+            SVProgressHUD.dismiss(withDelay: 1)
         } catch {
             Utils.alert(title: "Error".localize(), message: error.localizedDescription, controller: self, completion: nil)
         }