From 97368eb8a8ef60c0b6324216702f23b3d5ac572c Mon Sep 17 00:00:00 2001 From: Danny Moesch Date: Tue, 13 Nov 2018 23:54:53 +0100 Subject: [PATCH] Fix #228: Trim URL strings before saving --- pass/Controllers/GitServerSettingTableViewController.swift | 2 +- pass/Controllers/SSHKeySettingTableViewController.swift | 2 +- pass/Controllers/SettingsTableViewController.swift | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pass/Controllers/GitServerSettingTableViewController.swift b/pass/Controllers/GitServerSettingTableViewController.swift index 508bd60..a0dd223 100644 --- a/pass/Controllers/GitServerSettingTableViewController.swift +++ b/pass/Controllers/GitServerSettingTableViewController.swift @@ -75,7 +75,7 @@ class GitServerSettingTableViewController: UITableViewController { private func cloneAndSegueIfSuccess() { // try to clone - let gitRepostiroyURL = gitURLTextField.text! + let gitRepostiroyURL = gitURLTextField.text!.trimmed let username = usernameTextField.text! let auth = authenticationMethod diff --git a/pass/Controllers/SSHKeySettingTableViewController.swift b/pass/Controllers/SSHKeySettingTableViewController.swift index f14702a..698b873 100644 --- a/pass/Controllers/SSHKeySettingTableViewController.swift +++ b/pass/Controllers/SSHKeySettingTableViewController.swift @@ -22,7 +22,7 @@ class SSHKeySettingTableViewController: UITableViewController { @IBAction func doneButtonTapped(_ sender: UIButton) { - guard let privateKeyURL = URL(string: privateKeyURLTextField.text!) else { + guard let privateKeyURL = URL(string: privateKeyURLTextField.text!.trimmed) else { Utils.alert(title: "Cannot Save", message: "Please set Private Key URL first.", controller: self, completion: nil) return } diff --git a/pass/Controllers/SettingsTableViewController.swift b/pass/Controllers/SettingsTableViewController.swift index 1bc7dc1..9920e01 100644 --- a/pass/Controllers/SettingsTableViewController.swift +++ b/pass/Controllers/SettingsTableViewController.swift @@ -26,8 +26,8 @@ class SettingsTableViewController: UITableViewController, UITabBarControllerDele @IBAction func savePGPKey(segue: UIStoryboardSegue) { if let controller = segue.source as? PGPKeySettingTableViewController { - SharedDefaults[.pgpPrivateKeyURL] = URL(string: controller.pgpPrivateKeyURLTextField.text!) - SharedDefaults[.pgpPublicKeyURL] = URL(string: controller.pgpPublicKeyURLTextField.text!) + SharedDefaults[.pgpPrivateKeyURL] = URL(string: controller.pgpPrivateKeyURLTextField.text!.trimmed) + SharedDefaults[.pgpPublicKeyURL] = URL(string: controller.pgpPublicKeyURLTextField.text!.trimmed) if SharedDefaults[.isRememberPGPPassphraseOn] { self.passwordStore.pgpKeyPassphrase = controller.pgpPassphrase }