From d3f186013e9ead4c9fb4b385b06478a22df6effd Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Mon, 6 Feb 2017 11:11:26 +0800
Subject: [PATCH] add check when saving Git server settings (#1)

---
 pass/Base.lproj/Main.storyboard                |  2 +-
 pass/GitServerSettingTableViewController.swift | 18 ++++++++++++++++++
 pass/PasswordsViewController.swift             |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard
index 3e9977c..f82392e 100644
--- a/pass/Base.lproj/Main.storyboard
+++ b/pass/Base.lproj/Main.storyboard
@@ -314,7 +314,7 @@
                         </barButtonItem>
                         <barButtonItem key="rightBarButtonItem" style="done" systemItem="save" id="sgQ-zB-rxv">
                             <connections>
-                                <segue destination="7K9-cE-9qq" kind="unwind" unwindAction="saveWithSegue:" id="hvX-Fk-F21"/>
+                                <segue destination="7K9-cE-9qq" kind="unwind" identifier="saveGitServerSettingSegue" unwindAction="saveWithSegue:" id="hvX-Fk-F21"/>
                             </connections>
                         </barButtonItem>
                     </navigationItem>
diff --git a/pass/GitServerSettingTableViewController.swift b/pass/GitServerSettingTableViewController.swift
index 531d8df..9f2aea5 100644
--- a/pass/GitServerSettingTableViewController.swift
+++ b/pass/GitServerSettingTableViewController.swift
@@ -55,6 +55,24 @@ class GitServerSettingTableViewController: UITableViewController {
         view.endEditing(true)
     }
     
+    override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
+        if identifier == "saveGitServerSettingSegue" {
+            if gitRepositoryURLTextField.text == "" || authenticationMethod  == "" {
+                var alertMessage = ""
+                if gitRepositoryURLTextField.text == "" {
+                    alertMessage = "Git Server is not set. Please set the Git server first."
+                } else if authenticationMethod  == "" {
+                    alertMessage = "PGP Key is not set. Please set your PGP Key first."
+                }
+                let alert = UIAlertController(title: "Cannot Save Settings", message: alertMessage, preferredStyle: UIAlertControllerStyle.alert)
+                alert.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.default, handler: nil))
+                self.present(alert, animated: true, completion: nil)
+                return false
+            }
+        }
+        return true
+    }
+    
     @IBAction func save(segue: UIStoryboardSegue) {
         if let controller = segue.source as? UITableViewController {
             if controller.tableView.indexPathForSelectedRow == IndexPath(row: 0, section:0) {
diff --git a/pass/PasswordsViewController.swift b/pass/PasswordsViewController.swift
index 358280a..6642976 100644
--- a/pass/PasswordsViewController.swift
+++ b/pass/PasswordsViewController.swift
@@ -156,7 +156,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
     override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
         if identifier == "showPasswordDetail" {
             if Defaults[.pgpKeyID]  == "" {
-                let alert = UIAlertController(title: "Unable to Decrypt Password", message: "PGP Key is not set. Please set your PGP Key first.", preferredStyle: UIAlertControllerStyle.alert)
+                let alert = UIAlertController(title: "Cannot Show Password", message: "PGP Key is not set. Please set your PGP Key first.", preferredStyle: UIAlertControllerStyle.alert)
                 alert.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.default, handler: nil))
                 self.present(alert, animated: true, completion: nil)
                 if let s = sender as? UITableViewCell {