From f8bca758dc3b85dec25e5ce39af7955859ba1cd2 Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Fri, 6 Oct 2017 21:45:03 +0800
Subject: [PATCH 01/42] Version bump

---
 pass/Info.plist          | 2 +-
 passExtension/Info.plist | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pass/Info.plist b/pass/Info.plist
index 0cd043c..a64e4c0 100644
--- a/pass/Info.plist
+++ b/pass/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.9</string>
+	<string>0.2.10</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
diff --git a/passExtension/Info.plist b/passExtension/Info.plist
index f96e05e..4648406 100644
--- a/passExtension/Info.plist
+++ b/passExtension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.9</string>
+	<string>0.2.10</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

From 3b8c6117aab36f3fc08f8d1fb0a6b4aecb1e2537 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Fri, 6 Oct 2017 22:06:52 -0700
Subject: [PATCH 02/42] Update xcodeproj file for cocoapods

---
 pass.xcodeproj/project.pbxproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pass.xcodeproj/project.pbxproj b/pass.xcodeproj/project.pbxproj
index d011204..0febf93 100644
--- a/pass.xcodeproj/project.pbxproj
+++ b/pass.xcodeproj/project.pbxproj
@@ -874,10 +874,12 @@
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-passKitTests/Pods-passKitTests-frameworks.sh",
 				"${PODS_ROOT}/ObjectivePGP/Frameworks/ios/ObjectivePGP.framework",
+				"${PODS_ROOT}/ObjectivePGP/Frameworks/ios/ObjectivePGP.framework.dSYM",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjectivePGP.framework",
+				"${DWARF_DSYM_FOLDER_PATH}/ObjectivePGP.framework.dSYM",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -910,10 +912,12 @@
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-pass/Pods-pass-frameworks.sh",
 				"${PODS_ROOT}/ObjectivePGP/Frameworks/ios/ObjectivePGP.framework",
+				"${PODS_ROOT}/ObjectivePGP/Frameworks/ios/ObjectivePGP.framework.dSYM",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjectivePGP.framework",
+				"${DWARF_DSYM_FOLDER_PATH}/ObjectivePGP.framework.dSYM",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

From d5353ba4d1b068ce60b8c3029feb335103892385 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Fri, 6 Oct 2017 22:15:53 -0700
Subject: [PATCH 03/42] Change Swift 3 @objc Inference from On to Default to
 kill warnings

---
 pass.xcodeproj/project.pbxproj | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pass.xcodeproj/project.pbxproj b/pass.xcodeproj/project.pbxproj
index 0febf93..24f7730 100644
--- a/pass.xcodeproj/project.pbxproj
+++ b/pass.xcodeproj/project.pbxproj
@@ -1200,7 +1200,7 @@
 				SWIFT_INCLUDE_PATHS = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1245,7 +1245,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1268,7 +1268,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER).passKitTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/pass.app/pass";
 			};
@@ -1289,7 +1289,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER).passKitTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/pass.app/pass";
 			};
@@ -1323,7 +1323,7 @@
 				PROVISIONING_PROFILE = "d25c9029-bca6-4b2d-b04e-4abc9d232740";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development me.mssun.passforios.find-login-action-extension";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
@@ -1356,7 +1356,7 @@
 				PROVISIONING_PROFILE = "cbd86628-6f3e-40f3-b518-20d2330db545";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore me.mssun.passforios.find-login-action-extension";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
@@ -1372,7 +1372,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER).passTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/pass.app/pass";
 			};
@@ -1389,7 +1389,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER).passTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/pass.app/pass";
 			};
@@ -1448,7 +1448,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 			};
 			name = Debug;
 		};
@@ -1497,7 +1497,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = me.mssun.passforios;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -1533,7 +1533,7 @@
 				PROVISIONING_PROFILE = "2e72f4af-b935-4970-9cd3-44d4cc24b646";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development me.mssun.passforios";
 				SWIFT_OBJC_BRIDGING_HEADER = "pass/Helpers/Objective-CBridgingHeader.h";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1571,7 +1571,7 @@
 				PROVISIONING_PROFILE = "ee6e841d-ef77-4f00-b534-d7f1fd25dc1d";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore me.mssun.passforios";
 				SWIFT_OBJC_BRIDGING_HEADER = "pass/Helpers/Objective-CBridgingHeader.h";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";

From c57ae4f88e128a17b848de2ea051fcafee074b9a Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 00:24:30 -0700
Subject: [PATCH 04/42] Use iOS 11 design language

---
 pass/Base.lproj/Main.storyboard               |  4 +-
 .../Controllers/PasswordsViewController.swift | 38 ++++++++++++++-----
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard
index a70105f..413a892 100644
--- a/pass/Base.lproj/Main.storyboard
+++ b/pass/Base.lproj/Main.storyboard
@@ -776,8 +776,8 @@
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="ZmJ-0Z-N04" sceneMemberID="viewController">
                     <tabBarItem key="tabBarItem" title="Settings" image="Settings" selectedImage="Settings" id="6Xa-be-Z8g"/>
                     <toolbarItems/>
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="wWs-15-HDi">
-                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" largeTitles="YES" id="wWs-15-HDi">
+                        <rect key="frame" x="0.0" y="20" width="414" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift
index b7ca354..7706157 100644
--- a/pass/Controllers/PasswordsViewController.swift
+++ b/pass/Controllers/PasswordsViewController.swift
@@ -39,7 +39,6 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
         uiSearchController.searchResultsUpdater = self
         uiSearchController.dimsBackgroundDuringPresentation = false
         uiSearchController.searchBar.isTranslucent = false
-        uiSearchController.searchBar.backgroundColor = UIColor.gray
         uiSearchController.searchBar.sizeToFit()
         return uiSearchController
     }()
@@ -48,10 +47,13 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
         syncControl.addTarget(self, action: #selector(handleRefresh(_:)), for: UIControlEvents.valueChanged)
         return syncControl
     }()
-    private lazy var searchBarView: UIView = {
-        let uiView = UIView(frame: CGRect(x: 0, y: 64, width: self.view.bounds.width, height: 56))
-        uiView.addSubview(self.searchController.searchBar)
-        return uiView
+    private lazy var searchBarView: UIView? = {
+        guard #available(iOS 11, *) else {
+                        let uiView = UIView(frame: CGRect(x: 0, y: 64, width: self.view.bounds.width, height: 56))
+            uiView.addSubview(self.searchController.searchBar)
+            return uiView
+        }
+        return nil
     }()
     private lazy var backUIBarButtonItem: UIBarButtonItem = {
         let backUIBarButtonItem = UIBarButtonItem(title: "Back", style: .plain, target: self, action: #selector(self.backAction(_:)))
@@ -188,18 +190,28 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
         } else {
             searchController.searchBar.scopeButtonTitles = nil
         }
+        if #available(iOS 11.0, *) {
+            navigationItem.hidesSearchBarWhenScrolling = true
+        }
     }
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        
         tabBarController!.delegate = self
         searchController.searchBar.delegate = self
         tableView.delegate = self
         tableView.dataSource = self
-        tableView.contentInset = UIEdgeInsetsMake(56, 0, 0, 0)
         definesPresentationContext = true
-        view.addSubview(searchBarView)
+        if #available(iOS 11.0, *) {
+            navigationItem.searchController = searchController
+            navigationController?.navigationBar.prefersLargeTitles = true
+            navigationItem.largeTitleDisplayMode = .automatic
+            navigationItem.hidesSearchBarWhenScrolling = true
+        } else {
+            // Fallback on earlier versions
+            tableView.contentInset = UIEdgeInsetsMake(56, 0, 0, 0)
+            view.addSubview(searchBarView!)
+        }
         tableView.refreshControl = syncControl
         SVProgressHUD.setDefaultMaskType(.black)
         tableView.register(UINib(nibName: "PasswordWithFolderTableViewCell", bundle: nil), forCellReuseIdentifier: "passwordWithFolderTableViewCell")
@@ -219,12 +231,18 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
         if let path = tableView.indexPathForSelectedRow {
             tableView.deselectRow(at: path, animated: false)
         }
+        if #available(iOS 11.0, *) {
+            navigationItem.hidesSearchBarWhenScrolling = false
+        }
     }
     
     override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
-        searchBarView.frame = CGRect(x: 0, y: navigationController!.navigationBar.bounds.size.height + UIApplication.shared.statusBarFrame.height, width: UIScreen.main.bounds.width, height: 56)
-        searchController.searchBar.sizeToFit()
+        guard #available(iOS 11, *) else {
+            searchBarView?.frame = CGRect(x: 0, y: navigationController!.navigationBar.bounds.size.height + UIApplication.shared.statusBarFrame.height, width: UIScreen.main.bounds.width, height: 56)
+            searchController.searchBar.sizeToFit()
+            return
+        }
     }
     
      func numberOfSections(in tableView: UITableView) -> Int {

From 5c7ccc5b3742c7ff2462feb6302f54e27ec11bc1 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 10:42:09 -0700
Subject: [PATCH 05/42] Never use large titles in password details

---
 pass/Controllers/PasswordDetailTableViewController.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift
index 14d9a4a..41d5f80 100644
--- a/pass/Controllers/PasswordDetailTableViewController.swift
+++ b/pass/Controllers/PasswordDetailTableViewController.swift
@@ -89,6 +89,9 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
         tableView.addSubview(indicator)
         editUIBarButtonItem.isEnabled = false
         navigationItem.rightBarButtonItem = editUIBarButtonItem
+        if #available(iOS 11.0, *) {
+            navigationItem.largeTitleDisplayMode = .never
+        }
         
         if let imageData = passwordEntity?.image {
             let image = UIImage(data: imageData as Data)

From 3f3360259af167ac704faa34ba20edadeb42df4d Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 19:58:46 -0700
Subject: [PATCH 06/42] Optimize the top margin of raw password

---
 pass/Base.lproj/Main.storyboard | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard
index 413a892..19d4523 100644
--- a/pass/Base.lproj/Main.storyboard
+++ b/pass/Base.lproj/Main.storyboard
@@ -838,7 +838,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3dt-Ph-4As">
-                                <rect key="frame" x="20" y="10" width="374" height="726"/>
+                                <rect key="frame" x="20" y="72" width="374" height="664"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <string key="text">K7PBbkoaJf6mLyVX3EBU
 username: passforios-demo@email.com
@@ -853,8 +853,8 @@ Phone Support PIN #: 84719</string>
                         <constraints>
                             <constraint firstAttribute="trailingMargin" secondItem="3dt-Ph-4As" secondAttribute="trailing" id="2IV-7r-9eG"/>
                             <constraint firstItem="7JD-uM-IyS" firstAttribute="top" secondItem="3dt-Ph-4As" secondAttribute="bottom" id="3yp-aL-exH"/>
-                            <constraint firstItem="3dt-Ph-4As" firstAttribute="top" secondItem="XeK-cv-AXf" secondAttribute="bottom" constant="-54" id="5y9-J3-Luj"/>
                             <constraint firstAttribute="leadingMargin" secondItem="3dt-Ph-4As" secondAttribute="leading" id="jgf-j1-lNa"/>
+                            <constraint firstItem="3dt-Ph-4As" firstAttribute="top" secondItem="XeK-cv-AXf" secondAttribute="bottom" constant="8" symbolic="YES" id="yN7-0c-t4Y"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Raw Password" id="c13-zM-tLf">
@@ -1805,7 +1805,7 @@ Cgo
         <image name="Settings" width="25" height="25"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="iCM-Fy-hkk"/>
+        <segue reference="WfV-6d-ZUj"/>
         <segue reference="yyD-4H-pLE"/>
     </inferredMetricsTieBreakers>
 </document>

From be76987758f64666d9c1b8cf05486778c03668e7 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 20:51:13 -0700
Subject: [PATCH 07/42] Fix UI constraint warning

---
 pass/Base.lproj/Main.storyboard          |  2 +-
 pass/Views/FillPasswordTableViewCell.xib | 17 +++++++----------
 pass/Views/LabelTableViewCell.xib        | 11 +++++------
 pass/Views/TextFieldTableViewCell.xib    |  8 ++++----
 pass/Views/TextViewTableViewCell.xib     | 13 +++++++++----
 5 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard
index 19d4523..1cd7a3c 100644
--- a/pass/Base.lproj/Main.storyboard
+++ b/pass/Base.lproj/Main.storyboard
@@ -1806,6 +1806,6 @@ Cgo
     </resources>
     <inferredMetricsTieBreakers>
         <segue reference="WfV-6d-ZUj"/>
-        <segue reference="yyD-4H-pLE"/>
+        <segue reference="UfP-k3-XeR"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/pass/Views/FillPasswordTableViewCell.xib b/pass/Views/FillPasswordTableViewCell.xib
index 715a3d3..2ebed2b 100644
--- a/pass/Views/FillPasswordTableViewCell.xib
+++ b/pass/Views/FillPasswordTableViewCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -16,17 +16,14 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="90"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="320" height="90"/>
+                <rect key="frame" x="0.0" y="0.0" width="320" height="89.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="19l-R0-gP1">
-                        <rect key="frame" x="15" y="11" width="290" height="68"/>
+                        <rect key="frame" x="8" y="11" width="304" height="68"/>
                         <subviews>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="password" textAlignment="natural" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="k0U-2N-YaX" userLabel="Password">
-                                <rect key="frame" x="0.0" y="0.0" width="230" height="68"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="38" id="9gX-VT-F9P"/>
-                                </constraints>
+                                <rect key="frame" x="0.0" y="0.0" width="244" height="68"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                 <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="alphabet"/>
@@ -35,7 +32,7 @@
                                 </connections>
                             </textField>
                             <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hTh-ek-Xam" userLabel="Generate">
-                                <rect key="frame" x="230" y="0.0" width="30" height="68"/>
+                                <rect key="frame" x="244" y="0.0" width="30" height="68"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="30" id="l0l-7B-Tws"/>
                                 </constraints>
@@ -46,7 +43,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SZJ-aY-45Y" userLabel="Setting">
-                                <rect key="frame" x="260" y="0.0" width="30" height="68"/>
+                                <rect key="frame" x="274" y="0.0" width="30" height="68"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="30" id="D9D-FC-ANz"/>
                                 </constraints>
diff --git a/pass/Views/LabelTableViewCell.xib b/pass/Views/LabelTableViewCell.xib
index cd316bb..d5c85a8 100644
--- a/pass/Views/LabelTableViewCell.xib
+++ b/pass/Views/LabelTableViewCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -16,11 +16,11 @@
             <rect key="frame" x="0.0" y="0.0" width="333" height="59"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="333" height="59"/>
+                <rect key="frame" x="0.0" y="0.0" width="333" height="58.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="content" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yyr-cF-QN0">
-                        <rect key="frame" x="15" y="27" width="303" height="21"/>
+                        <rect key="frame" x="8" y="27" width="56" height="21"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="21" id="pgw-DF-LQa"/>
                         </constraints>
@@ -29,7 +29,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dqz-7n-uEZ">
-                        <rect key="frame" x="15" y="11" width="303" height="13"/>
+                        <rect key="frame" x="8" y="11" width="317" height="13"/>
                         <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                         <color key="textColor" red="0.0" green="0.47843137254901957" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
@@ -40,7 +40,6 @@
                     <constraint firstItem="Dqz-7n-uEZ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="CVm-uc-iVo"/>
                     <constraint firstAttribute="topMargin" secondItem="Dqz-7n-uEZ" secondAttribute="top" id="N4y-iT-CiY"/>
                     <constraint firstItem="yyr-cF-QN0" firstAttribute="leading" secondItem="Dqz-7n-uEZ" secondAttribute="leading" id="TpW-bu-QIx"/>
-                    <constraint firstItem="yyr-cF-QN0" firstAttribute="width" secondItem="Dqz-7n-uEZ" secondAttribute="width" id="ZXa-fK-0Bg"/>
                     <constraint firstAttribute="bottomMargin" secondItem="yyr-cF-QN0" secondAttribute="bottom" id="mIj-9c-ElE"/>
                     <constraint firstItem="yyr-cF-QN0" firstAttribute="top" secondItem="Dqz-7n-uEZ" secondAttribute="bottom" constant="3" id="sgc-hN-i8t"/>
                 </constraints>
diff --git a/pass/Views/TextFieldTableViewCell.xib b/pass/Views/TextFieldTableViewCell.xib
index 35d3feb..00a066d 100644
--- a/pass/Views/TextFieldTableViewCell.xib
+++ b/pass/Views/TextFieldTableViewCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16F43c" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -20,7 +20,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="8Ky-UZ-sLu">
-                        <rect key="frame" x="15" y="11" width="290" height="47"/>
+                        <rect key="frame" x="8" y="11" width="304" height="47"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="38" id="R1z-fU-Xr2"/>
                         </constraints>
@@ -33,7 +33,7 @@
                     <constraint firstItem="8Ky-UZ-sLu" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="3h4-9E-oDJ"/>
                     <constraint firstItem="8Ky-UZ-sLu" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" id="FH4-4T-aaK"/>
                     <constraint firstAttribute="trailingMargin" secondItem="8Ky-UZ-sLu" secondAttribute="trailing" id="Nii-Cg-gC1"/>
-                    <constraint firstAttribute="bottomMargin" secondItem="8Ky-UZ-sLu" secondAttribute="bottom" id="h72-l3-Sb3"/>
+                    <constraint firstAttribute="bottomMargin" secondItem="8Ky-UZ-sLu" secondAttribute="bottom" priority="750" id="h72-l3-Sb3"/>
                 </constraints>
             </tableViewCellContentView>
             <connections>
diff --git a/pass/Views/TextViewTableViewCell.xib b/pass/Views/TextViewTableViewCell.xib
index 564a3c8..0e13d70 100644
--- a/pass/Views/TextViewTableViewCell.xib
+++ b/pass/Views/TextViewTableViewCell.xib
@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12118" systemVersion="16F43c" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="Menlo.ttc">
+            <string>Menlo-Regular</string>
+        </array>
+    </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -20,7 +25,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xHX-Sh-1pR">
-                        <rect key="frame" x="15" y="11" width="290" height="195"/>
+                        <rect key="frame" x="8" y="11" width="304" height="195"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="120" id="Tvq-j8-Nvh"/>
@@ -32,7 +37,7 @@
                 <constraints>
                     <constraint firstAttribute="trailingMargin" secondItem="xHX-Sh-1pR" secondAttribute="trailing" id="LWS-JW-9dS"/>
                     <constraint firstItem="xHX-Sh-1pR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="SRq-7t-Gyr"/>
-                    <constraint firstAttribute="bottomMargin" secondItem="xHX-Sh-1pR" secondAttribute="bottom" id="UPQ-jk-QJR"/>
+                    <constraint firstAttribute="bottomMargin" secondItem="xHX-Sh-1pR" secondAttribute="bottom" priority="750" id="UPQ-jk-QJR"/>
                     <constraint firstItem="xHX-Sh-1pR" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" id="gwb-2C-4wp"/>
                 </constraints>
             </tableViewCellContentView>

From 77a38807f340bbe6a8322c2bba365c9923cd4afb Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 21:07:02 -0700
Subject: [PATCH 08/42] Additional content show at top by default when editing
 a password

---
 pass/Controllers/PasswordEditorTableViewController.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pass/Controllers/PasswordEditorTableViewController.swift b/pass/Controllers/PasswordEditorTableViewController.swift
index 71defd2..ce72409 100644
--- a/pass/Controllers/PasswordEditorTableViewController.swift
+++ b/pass/Controllers/PasswordEditorTableViewController.swift
@@ -75,6 +75,9 @@ class PasswordEditorTableViewController: UITableViewController, FillPasswordTabl
         self.tableView.sectionFooterHeight = UITableViewAutomaticDimension;
         self.tableView.estimatedSectionFooterHeight = 0;
     }
+    override func viewDidLayoutSubviews() {
+       additionsCell?.contentTextView.setContentOffset(.zero, animated: false)
+    }
     
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cellData = tableData[indexPath.section][indexPath.row]

From 77a98186226dce509873e2014e31abfdc730f6e2 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 21:18:37 -0700
Subject: [PATCH 09/42] Fix a UI bug in LabelTableViewCell to show long
 sentense

---
 pass/Views/LabelTableViewCell.xib | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pass/Views/LabelTableViewCell.xib b/pass/Views/LabelTableViewCell.xib
index d5c85a8..157ca44 100644
--- a/pass/Views/LabelTableViewCell.xib
+++ b/pass/Views/LabelTableViewCell.xib
@@ -20,7 +20,7 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="content" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yyr-cF-QN0">
-                        <rect key="frame" x="8" y="27" width="56" height="21"/>
+                        <rect key="frame" x="8" y="27" width="305" height="21"/>
                         <constraints>
                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="21" id="pgw-DF-LQa"/>
                         </constraints>
@@ -40,6 +40,7 @@
                     <constraint firstItem="Dqz-7n-uEZ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="CVm-uc-iVo"/>
                     <constraint firstAttribute="topMargin" secondItem="Dqz-7n-uEZ" secondAttribute="top" id="N4y-iT-CiY"/>
                     <constraint firstItem="yyr-cF-QN0" firstAttribute="leading" secondItem="Dqz-7n-uEZ" secondAttribute="leading" id="TpW-bu-QIx"/>
+                    <constraint firstAttribute="trailing" secondItem="yyr-cF-QN0" secondAttribute="trailing" constant="20" symbolic="YES" id="evr-4N-30Z"/>
                     <constraint firstAttribute="bottomMargin" secondItem="yyr-cF-QN0" secondAttribute="bottom" id="mIj-9c-ElE"/>
                     <constraint firstItem="yyr-cF-QN0" firstAttribute="top" secondItem="Dqz-7n-uEZ" secondAttribute="bottom" constant="3" id="sgc-hN-i8t"/>
                 </constraints>

From f3551a15422c50c171b2b00ef4e4a21470cc02b5 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 21:54:56 -0700
Subject: [PATCH 10/42] Change the password's font to Courier

---
 passKit/Helpers/Globals.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passKit/Helpers/Globals.swift b/passKit/Helpers/Globals.swift
index 930ce56..1ecb124 100644
--- a/passKit/Helpers/Globals.swift
+++ b/passKit/Helpers/Globals.swift
@@ -47,7 +47,7 @@ public class Globals {
     
     public static let passwordDots = "••••••••••••"
     public static let oneTimePasswordDots = "••••••"
-    public static let passwordFonts = "Menlo"
+    public static let passwordFonts = "Courier"
     
     // UI related
     public static let red = UIColor(red:1.00, green:0.23, blue:0.19, alpha:1.0)

From 6ea47766bccc7aa8c6ffa5ab64cfbc5275adc53f Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 22:16:59 -0700
Subject: [PATCH 11/42] Specify colors for digits and letters in password

---
 passKit/Helpers/Globals.swift | 2 ++
 passKit/Helpers/Utils.swift   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/passKit/Helpers/Globals.swift b/passKit/Helpers/Globals.swift
index 1ecb124..5bd7688 100644
--- a/passKit/Helpers/Globals.swift
+++ b/passKit/Helpers/Globals.swift
@@ -52,6 +52,8 @@ public class Globals {
     // UI related
     public static let red = UIColor(red:1.00, green:0.23, blue:0.19, alpha:1.0)
     public static let blue = UIColor(red:0.00, green:0.48, blue:1.00, alpha:1.0)
+    public static let letterColor = UIColor(red:200/255.0, green:40/255.0, blue:41/255.0, alpha:1.0)
+    public static let digitColor = UIColor(red:66/255.0, green:113/255.0, blue:174/255.0, alpha:1.0)
     public static let tableCellButtonSize = CGFloat(20.0)
     
     private init() { }
diff --git a/passKit/Helpers/Utils.swift b/passKit/Helpers/Utils.swift
index 7767ffb..3ddd167 100644
--- a/passKit/Helpers/Utils.swift
+++ b/passKit/Helpers/Utils.swift
@@ -107,9 +107,9 @@ public class Utils {
         for (index, element) in plainPassword.unicodeScalars.enumerated() {
             var charColor = UIColor.darkText
             if NSCharacterSet.decimalDigits.contains(element) {
-                charColor = Globals.red
+                charColor = Globals.digitColor
             } else if !NSCharacterSet.letters.contains(element) {
-                charColor = Globals.blue
+                charColor = Globals.letterColor
             }
             attributedPassword.addAttribute(NSAttributedStringKey.foregroundColor, value: charColor, range: NSRange(location: index, length: 1))
         }

From 3605e59c30ab98fdd25de58372ece5158c6b5b84 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 23:05:26 -0700
Subject: [PATCH 12/42] Tweak password font

---
 pass/Views/FillPasswordTableViewCell.swift | 2 +-
 pass/Views/LabelTableViewCell.swift        | 4 ++--
 passKit/Helpers/Globals.swift              | 5 +++--
 passKit/Helpers/Utils.swift                | 2 ++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pass/Views/FillPasswordTableViewCell.swift b/pass/Views/FillPasswordTableViewCell.swift
index 97c702d..0042ba1 100644
--- a/pass/Views/FillPasswordTableViewCell.swift
+++ b/pass/Views/FillPasswordTableViewCell.swift
@@ -25,7 +25,7 @@ class FillPasswordTableViewCell: ContentTableViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
-        contentTextField.font = UIFont(name: Globals.passwordFonts, size: (contentTextField.font?.pointSize)!)
+        contentTextField.font = Globals.passwordFont
         
         // Force aspect ratio of button images
         settingButton.imageView?.contentMode = .scaleAspectFit
diff --git a/pass/Views/LabelTableViewCell.swift b/pass/Views/LabelTableViewCell.swift
index fd72303..b1d8def 100644
--- a/pass/Views/LabelTableViewCell.swift
+++ b/pass/Views/LabelTableViewCell.swift
@@ -51,7 +51,7 @@ class LabelTableViewCell: UITableViewCell {
                         contentLabel.text = Globals.passwordDots
                     }
                 }
-                contentLabel.font = UIFont(name: Globals.passwordFonts, size: contentLabel.font.pointSize)
+                contentLabel.font = Globals.passwordFont
             case "hmac-based":
                 type = .HOTP
                 if isReveal {
@@ -59,7 +59,7 @@ class LabelTableViewCell: UITableViewCell {
                 } else {
                     contentLabel.text = Globals.oneTimePasswordDots
                 }
-                contentLabel.font = UIFont(name: Globals.passwordFonts, size: contentLabel.font.pointSize)
+                contentLabel.font = Globals.passwordFont
             case "url":
                 type = .URL
                 contentLabel.text = content
diff --git a/passKit/Helpers/Globals.swift b/passKit/Helpers/Globals.swift
index 5bd7688..cc7962d 100644
--- a/passKit/Helpers/Globals.swift
+++ b/passKit/Helpers/Globals.swift
@@ -47,12 +47,13 @@ public class Globals {
     
     public static let passwordDots = "••••••••••••"
     public static let oneTimePasswordDots = "••••••"
-    public static let passwordFonts = "Courier"
+    public static let passwordFont = UIFont(name: "Courier-Bold", size: UIFont.labelFontSize - 1)
     
     // UI related
     public static let red = UIColor(red:1.00, green:0.23, blue:0.19, alpha:1.0)
     public static let blue = UIColor(red:0.00, green:0.48, blue:1.00, alpha:1.0)
-    public static let letterColor = UIColor(red:200/255.0, green:40/255.0, blue:41/255.0, alpha:1.0)
+    public static let letterColor = UIColor(red:40/255.0, green:42/255.0, blue:54/255.0, alpha:1.0)
+    public static let symbolColor = UIColor(red:200/255.0, green:40/255.0, blue:41/255.0, alpha:1.0)
     public static let digitColor = UIColor(red:66/255.0, green:113/255.0, blue:174/255.0, alpha:1.0)
     public static let tableCellButtonSize = CGFloat(20.0)
     
diff --git a/passKit/Helpers/Utils.swift b/passKit/Helpers/Utils.swift
index 3ddd167..c97308e 100644
--- a/passKit/Helpers/Utils.swift
+++ b/passKit/Helpers/Utils.swift
@@ -109,6 +109,8 @@ public class Utils {
             if NSCharacterSet.decimalDigits.contains(element) {
                 charColor = Globals.digitColor
             } else if !NSCharacterSet.letters.contains(element) {
+                charColor = Globals.symbolColor
+            } else {
                 charColor = Globals.letterColor
             }
             attributedPassword.addAttribute(NSAttributedStringKey.foregroundColor, value: charColor, range: NSRange(location: index, length: 1))

From 3215fb2901cce9dc11466d9abcc099ff16e37cc5 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sat, 7 Oct 2017 23:14:00 -0700
Subject: [PATCH 13/42] Do not hide search bar when scrolling

---
 pass/Controllers/PasswordsViewController.swift | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift
index 7706157..57729c3 100644
--- a/pass/Controllers/PasswordsViewController.swift
+++ b/pass/Controllers/PasswordsViewController.swift
@@ -190,9 +190,6 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
         } else {
             searchController.searchBar.scopeButtonTitles = nil
         }
-        if #available(iOS 11.0, *) {
-            navigationItem.hidesSearchBarWhenScrolling = true
-        }
     }
     
     override func viewDidLoad() {
@@ -206,7 +203,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
             navigationItem.searchController = searchController
             navigationController?.navigationBar.prefersLargeTitles = true
             navigationItem.largeTitleDisplayMode = .automatic
-            navigationItem.hidesSearchBarWhenScrolling = true
+            navigationItem.hidesSearchBarWhenScrolling = false
         } else {
             // Fallback on earlier versions
             tableView.contentInset = UIEdgeInsetsMake(56, 0, 0, 0)
@@ -231,9 +228,6 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
         if let path = tableView.indexPathForSelectedRow {
             tableView.deselectRow(at: path, animated: false)
         }
-        if #available(iOS 11.0, *) {
-            navigationItem.hidesSearchBarWhenScrolling = false
-        }
     }
     
     override func viewWillLayoutSubviews() {

From e0c0606852ae8c5b65c8c5f9f83fb0c9bd71697b Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Sun, 8 Oct 2017 00:02:26 -0700
Subject: [PATCH 14/42] Remove the indicator in loading password details

---
 pass/Controllers/PasswordDetailTableViewController.swift | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift
index 41d5f80..f16f087 100644
--- a/pass/Controllers/PasswordDetailTableViewController.swift
+++ b/pass/Controllers/PasswordDetailTableViewController.swift
@@ -19,12 +19,6 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
     private var shouldPopCurrentView = false
     private let passwordStore = PasswordStore.shared
     
-    private let indicator: UIActivityIndicatorView = {
-        let indicator = UIActivityIndicatorView(activityIndicatorStyle: .gray)
-        indicator.center = CGPoint(x: UIScreen.main.bounds.width / 2, y: UIScreen.main.bounds.height * 0.382)
-        return indicator
-    }()
-    
     private lazy var editUIBarButtonItem: UIBarButtonItem = {
         let uiBarButtonItem = UIBarButtonItem(barButtonSystemItem: .edit, target: self, action: #selector(pressEdit(_:)))
         return uiBarButtonItem
@@ -85,8 +79,6 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
         tableView.rowHeight = UITableViewAutomaticDimension
         tableView.estimatedRowHeight = 52
         
-        indicator.startAnimating()
-        tableView.addSubview(indicator)
         editUIBarButtonItem.isEnabled = false
         navigationItem.rightBarButtonItem = editUIBarButtonItem
         if #available(iOS 11.0, *) {
@@ -177,7 +169,6 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
     
     private func showPassword() {
         DispatchQueue.main.async { [weak self] in
-            self?.indicator.stopAnimating()
             self?.setTableData()
             self?.tableView.reloadData()
             self?.editUIBarButtonItem.isEnabled = true

From d0bad8660b2326191dee9f96c520a248e4b36266 Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Sun, 8 Oct 2017 21:37:58 +0800
Subject: [PATCH 15/42] Provide the 'remember git credential passphrases'
 option

---
 .../GeneralSettingsTableViewController.swift  | 40 ++++++++++++++-----
 .../GitServerSettingTableViewController.swift | 22 ++++++++--
 ...GPKeyArmorSettingTableViewController.swift |  4 +-
 .../PGPKeySettingTableViewController.swift    |  4 +-
 .../PasswordDetailTableViewController.swift   |  2 +-
 .../Controllers/PasswordsViewController.swift | 13 +++++-
 .../SettingsTableViewController.swift         |  8 ++--
 passExtension/ExtensionViewController.swift   |  2 +-
 passKit/Helpers/DefaultsKeys.swift            |  3 +-
 passKit/Models/GitCredential.swift            | 31 +++++++-------
 passKit/Models/PasswordStore.swift            | 12 ++++--
 11 files changed, 97 insertions(+), 44 deletions(-)

diff --git a/pass/Controllers/GeneralSettingsTableViewController.swift b/pass/Controllers/GeneralSettingsTableViewController.swift
index 051b19e..209c5ed 100644
--- a/pass/Controllers/GeneralSettingsTableViewController.swift
+++ b/pass/Controllers/GeneralSettingsTableViewController.swift
@@ -28,12 +28,21 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
         return uiSwitch
     }()
     
-    let rememberPassphraseSwitch: UISwitch = {
+    let rememberPGPPassphraseSwitch: UISwitch = {
         let uiSwitch = UISwitch()
         uiSwitch.onTintColor = Globals.blue
         uiSwitch.sizeToFit()
-        uiSwitch.addTarget(self, action: #selector(rememberPassphraseSwitchAction(_:)), for: UIControlEvents.valueChanged)
-        uiSwitch.isOn = SharedDefaults[.isRememberPassphraseOn]
+        uiSwitch.addTarget(self, action: #selector(rememberPGPPassphraseSwitchAction(_:)), for: UIControlEvents.valueChanged)
+        uiSwitch.isOn = SharedDefaults[.isRememberPGPPassphraseOn]
+        return uiSwitch
+    }()
+    
+    let rememberGitCredentialPassphraseSwitch: UISwitch = {
+        let uiSwitch = UISwitch()
+        uiSwitch.onTintColor = Globals.blue
+        uiSwitch.sizeToFit()
+        uiSwitch.addTarget(self, action: #selector(rememberGitCredentialPassphraseSwitchAction(_:)), for: UIControlEvents.valueChanged)
+        uiSwitch.isOn = SharedDefaults[.isRememberGitCredentialPassphraseOn]
         return uiSwitch
     }()
     
@@ -58,7 +67,8 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
             
             // section 2
             [
-                [.title: "Remember Passphrase", .action: "none",],
+                [.title: "Remember PGP Key Passphrase", .action: "none",],
+                [.title: "Remember Git Credential Passphrase", .action: "none",],
             ],
             [
                 [.title: "Show Folder", .action: "none",],
@@ -98,10 +108,14 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
             cell.accessoryView = accessoryView
             cell.selectionStyle = .none
             hideOTPSwitch.isOn = SharedDefaults[.isHideOTPOn]
-        case "Remember Passphrase":
+        case "Remember PGP Key Passphrase":
             cell.accessoryType = .none
             cell.selectionStyle = .none
-            cell.accessoryView = rememberPassphraseSwitch
+            cell.accessoryView = rememberPGPPassphraseSwitch
+        case "Remember Git Credential Passphrase":
+            cell.accessoryType = .none
+            cell.selectionStyle = .none
+            cell.accessoryView = rememberGitCredentialPassphraseSwitch
         case "Show Folder":
             cell.accessoryType = .none
             cell.selectionStyle = .none
@@ -176,13 +190,21 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
         NotificationCenter.default.post(name: .passwordDetailDisplaySettingChanged, object: nil)
     }
     
-    @objc func rememberPassphraseSwitchAction(_ sender: Any?) {
-        SharedDefaults[.isRememberPassphraseOn] = rememberPassphraseSwitch.isOn
-        if rememberPassphraseSwitch.isOn == false {
+    @objc func rememberPGPPassphraseSwitchAction(_ sender: Any?) {
+        SharedDefaults[.isRememberPGPPassphraseOn] = rememberPGPPassphraseSwitch.isOn
+        if rememberPGPPassphraseSwitch.isOn == false {
             passwordStore.pgpKeyPassphrase = nil
         }
     }
     
+    @objc func rememberGitCredentialPassphraseSwitchAction(_ sender: Any?) {
+        SharedDefaults[.isRememberGitCredentialPassphraseOn] = rememberGitCredentialPassphraseSwitch.isOn
+        if rememberGitCredentialPassphraseSwitch.isOn == false {
+            passwordStore.gitSSHPrivateKeyPassphrase = nil
+            passwordStore.gitPassword = nil
+        }
+    }
+    
     @objc func showFolderSwitchAction(_ sender: Any?) {
         SharedDefaults[.isShowFolderOn] = showFolderSwitch.isOn
         NotificationCenter.default.post(name: .passwordDisplaySettingChanged, object: nil)
diff --git a/pass/Controllers/GitServerSettingTableViewController.swift b/pass/Controllers/GitServerSettingTableViewController.swift
index ab3d76b..8189eb3 100644
--- a/pass/Controllers/GitServerSettingTableViewController.swift
+++ b/pass/Controllers/GitServerSettingTableViewController.swift
@@ -93,6 +93,8 @@ class GitServerSettingTableViewController: UITableViewController {
                 )
             )
         }
+        // Remember git credential password/passphrase temporarily, ask whether users want this after a successful clone.
+        SharedDefaults[.isRememberGitCredentialPassphraseOn] = true
         let dispatchQueue = DispatchQueue.global(qos: .userInitiated)
         dispatchQueue.async {
             do {
@@ -113,9 +115,21 @@ class GitServerSettingTableViewController: UITableViewController {
                     SharedDefaults[.gitURL] = URL(string: gitRepostiroyURL)
                     SharedDefaults[.gitUsername] = username
                     SharedDefaults[.gitAuthenticationMethod] = auth
-                    SVProgressHUD.showSuccess(withStatus: "Done")
-                    SVProgressHUD.dismiss(withDelay: 1)
-                    self.performSegue(withIdentifier: "saveGitServerSettingSegue", sender: self)
+                    SVProgressHUD.dismiss()
+                    let savePassphraseAlert = UIAlertController(title: "Done", message: "Do you want to save the Git credential password/passphrase?", preferredStyle: UIAlertControllerStyle.alert)
+                    // no
+                    savePassphraseAlert.addAction(UIAlertAction(title: "No", style: UIAlertActionStyle.default) { _ in
+                        SharedDefaults[.isRememberGitCredentialPassphraseOn] = false
+                        self.passwordStore.gitPassword = nil
+                        self.passwordStore.gitSSHPrivateKeyPassphrase = nil
+                        self.performSegue(withIdentifier: "saveGitServerSettingSegue", sender: self)
+                    })
+                    // yes
+                    savePassphraseAlert.addAction(UIAlertAction(title: "Yes", style: UIAlertActionStyle.destructive) {_ in
+                        SharedDefaults[.isRememberGitCredentialPassphraseOn] = true
+                        self.performSegue(withIdentifier: "saveGitServerSettingSegue", sender: self)
+                    })
+                    self.present(savePassphraseAlert, animated: true, completion: nil)
                 }
             } catch {
                 DispatchQueue.main.async {
@@ -257,7 +271,7 @@ class GitServerSettingTableViewController: UITableViewController {
         case .http:
             message = "Please fill in the password of your Git account."
         case .ssh:
-            message = "Please fill in the password of your SSH key."
+            message = "Please fill in the passphrase of your SSH key."
         }
         
         DispatchQueue.main.async {
diff --git a/pass/Controllers/PGPKeyArmorSettingTableViewController.swift b/pass/Controllers/PGPKeyArmorSettingTableViewController.swift
index 30705b2..d3430ed 100644
--- a/pass/Controllers/PGPKeyArmorSettingTableViewController.swift
+++ b/pass/Controllers/PGPKeyArmorSettingTableViewController.swift
@@ -120,7 +120,7 @@ class PGPKeyArmorSettingTableViewController: UITableViewController, UITextViewDe
         // no
         savePassphraseAlert.addAction(UIAlertAction(title: "No", style: UIAlertActionStyle.default) { _ in
             self.pgpPassphrase = nil
-            SharedDefaults[.isRememberPassphraseOn] = false
+            SharedDefaults[.isRememberPGPPassphraseOn] = false
             self.performSegue(withIdentifier: "savePGPKeySegue", sender: self)
         })
         // yes
@@ -129,7 +129,7 @@ class PGPKeyArmorSettingTableViewController: UITableViewController, UITextViewDe
             let alert = UIAlertController(title: "Passphrase", message: "Please fill in the passphrase of your PGP secret key.", preferredStyle: UIAlertControllerStyle.alert)
             alert.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.default, handler: {_ in
                 self.pgpPassphrase = alert.textFields?.first?.text
-                SharedDefaults[.isRememberPassphraseOn] = true
+                SharedDefaults[.isRememberPGPPassphraseOn] = true
                 self.performSegue(withIdentifier: "savePGPKeySegue", sender: self)
             }))
             alert.addTextField(configurationHandler: {(textField: UITextField!) in
diff --git a/pass/Controllers/PGPKeySettingTableViewController.swift b/pass/Controllers/PGPKeySettingTableViewController.swift
index 364b82a..ae86c7d 100644
--- a/pass/Controllers/PGPKeySettingTableViewController.swift
+++ b/pass/Controllers/PGPKeySettingTableViewController.swift
@@ -45,7 +45,7 @@ class PGPKeySettingTableViewController: UITableViewController {
         // no
         savePassphraseAlert.addAction(UIAlertAction(title: "No", style: UIAlertActionStyle.default) { _ in
             self.pgpPassphrase = nil
-            SharedDefaults[.isRememberPassphraseOn] = false
+            SharedDefaults[.isRememberPGPPassphraseOn] = false
             self.performSegue(withIdentifier: "savePGPKeySegue", sender: self)
         })
         // yes
@@ -54,7 +54,7 @@ class PGPKeySettingTableViewController: UITableViewController {
             let alert = UIAlertController(title: "Passphrase", message: "Please fill in the passphrase of your PGP secret key.", preferredStyle: UIAlertControllerStyle.alert)
             alert.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.default, handler: {_ in
                 self.pgpPassphrase = alert.textFields?.first?.text
-                SharedDefaults[.isRememberPassphraseOn] = true
+                SharedDefaults[.isRememberPGPPassphraseOn] = true
                 self.performSegue(withIdentifier: "savePGPKeySegue", sender: self)
             }))
             alert.addTextField(configurationHandler: {(textField: UITextField!) in
diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift
index 14d9a4a..0209d61 100644
--- a/pass/Controllers/PasswordDetailTableViewController.swift
+++ b/pass/Controllers/PasswordDetailTableViewController.swift
@@ -134,7 +134,7 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
             self.present(alert, animated: true, completion: nil)
         }
         let _ = sem.wait(timeout: DispatchTime.distantFuture)
-        if SharedDefaults[.isRememberPassphraseOn] {
+        if SharedDefaults[.isRememberPGPPassphraseOn] {
             self.passwordStore.pgpKeyPassphrase = passphrase
         }
         return passphrase
diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift
index 7706157..322752b 100644
--- a/pass/Controllers/PasswordsViewController.swift
+++ b/pass/Controllers/PasswordsViewController.swift
@@ -174,8 +174,17 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
                 DispatchQueue.main.async {
                     SVProgressHUD.dismiss()
                     self.syncControl.endRefreshing()
+                    let error = error as NSError
+                    var message = error.localizedDescription
+                    if let underlyingError = error.userInfo[NSUnderlyingErrorKey] as? NSError {
+                        message = "\(message)\nUnderlying error: \(underlyingError.localizedDescription)"
+                        if underlyingError.localizedDescription.contains("Wrong passphrase") {
+                            message = "\(message)\nRecovery suggestion: Wrong credential password/passphrase has been removed, please try again."
+                            gitCredential.delete()
+                        }
+                    }
                     DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(800)) {
-                        Utils.alert(title: "Error", message: error.localizedDescription, controller: self, completion: nil)
+                        Utils.alert(title: "Error", message: message, controller: self, completion: nil)
                     }
                 }
             }
@@ -369,7 +378,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
             // bring back
             SVProgressHUD.show(withStatus: "Decrypting")
         }
-        if SharedDefaults[.isRememberPassphraseOn] {
+        if SharedDefaults[.isRememberPGPPassphraseOn] {
             self.passwordStore.pgpKeyPassphrase = passphrase
         }
         return passphrase
diff --git a/pass/Controllers/SettingsTableViewController.swift b/pass/Controllers/SettingsTableViewController.swift
index c8b6986..cc24bc1 100644
--- a/pass/Controllers/SettingsTableViewController.swift
+++ b/pass/Controllers/SettingsTableViewController.swift
@@ -33,7 +33,7 @@ class SettingsTableViewController: UITableViewController {
         if let controller = segue.source as? PGPKeySettingTableViewController {
             SharedDefaults[.pgpPrivateKeyURL] = URL(string: controller.pgpPrivateKeyURLTextField.text!)
             SharedDefaults[.pgpPublicKeyURL] = URL(string: controller.pgpPublicKeyURLTextField.text!)
-            if SharedDefaults[.isRememberPassphraseOn] {
+            if SharedDefaults[.isRememberPGPPassphraseOn] {
                 self.passwordStore.pgpKeyPassphrase = controller.pgpPassphrase
             }
             SharedDefaults[.pgpKeySource] = "url"
@@ -61,7 +61,7 @@ class SettingsTableViewController: UITableViewController {
             
         } else if let controller = segue.source as? PGPKeyArmorSettingTableViewController {
             SharedDefaults[.pgpKeySource] = "armor"
-            if SharedDefaults[.isRememberPassphraseOn] {
+            if SharedDefaults[.isRememberPGPPassphraseOn] {
                 self.passwordStore.pgpKeyPassphrase = controller.pgpPassphrase
             }
 
@@ -259,7 +259,7 @@ class SettingsTableViewController: UITableViewController {
                 // no
                 savePassphraseAlert.addAction(UIAlertAction(title: "No", style: UIAlertActionStyle.default) { _ in
                     self.passwordStore.pgpKeyPassphrase = nil
-                    SharedDefaults[.isRememberPassphraseOn] = false
+                    SharedDefaults[.isRememberPGPPassphraseOn] = false
                     self.saveImportedPGPKey()
                 })
                 // yes
@@ -268,7 +268,7 @@ class SettingsTableViewController: UITableViewController {
                     let alert = UIAlertController(title: "Passphrase", message: "Please fill in the passphrase of your PGP secret key.", preferredStyle: UIAlertControllerStyle.alert)
                     alert.addAction(UIAlertAction(title: "OK", style: UIAlertActionStyle.default, handler: {_ in
                         self.passwordStore.pgpKeyPassphrase = alert.textFields?.first?.text
-                        SharedDefaults[.isRememberPassphraseOn] = true
+                        SharedDefaults[.isRememberPGPPassphraseOn] = true
                         self.saveImportedPGPKey()
                     }))
                     alert.addTextField(configurationHandler: {(textField: UITextField!) in
diff --git a/passExtension/ExtensionViewController.swift b/passExtension/ExtensionViewController.swift
index 29f6f0b..a37912d 100644
--- a/passExtension/ExtensionViewController.swift
+++ b/passExtension/ExtensionViewController.swift
@@ -223,7 +223,7 @@ class ExtensionViewController: UIViewController, UITableViewDataSource, UITableV
             self.present(alert, animated: true, completion: nil)
         }
         let _ = sem.wait(timeout: DispatchTime.distantFuture)
-        if SharedDefaults[.isRememberPassphraseOn] {
+        if SharedDefaults[.isRememberPGPPassphraseOn] {
             self.passwordStore.pgpKeyPassphrase = passphrase
         }
         return passphrase
diff --git a/passKit/Helpers/DefaultsKeys.swift b/passKit/Helpers/DefaultsKeys.swift
index 5a4a597..508f395 100644
--- a/passKit/Helpers/DefaultsKeys.swift
+++ b/passKit/Helpers/DefaultsKeys.swift
@@ -35,7 +35,8 @@ public extension DefaultsKeys {
     
     static let isHideUnknownOn = DefaultsKey<Bool>("isHideUnknownOn")
     static let isHideOTPOn = DefaultsKey<Bool>("isHideOTPOn")
-    static let isRememberPassphraseOn = DefaultsKey<Bool>("isRememberPassphraseOn")
+    static let isRememberPGPPassphraseOn = DefaultsKey<Bool>("isRememberPGPPassphraseOn")
+    static let isRememberGitCredentialPassphraseOn = DefaultsKey<Bool>("isRememberGitCredentialPassphraseOn")
     static let isShowFolderOn = DefaultsKey<Bool>("isShowFolderOn")
     static let passwordGeneratorFlavor = DefaultsKey<String>("passwordGeneratorFlavor")
     
diff --git a/passKit/Models/GitCredential.swift b/passKit/Models/GitCredential.swift
index d71aa51..ddf5741 100644
--- a/passKit/Models/GitCredential.swift
+++ b/passKit/Models/GitCredential.swift
@@ -26,38 +26,39 @@ public struct GitCredential {
     
     public func credentialProvider(requestGitPassword: @escaping (Credential, String?) -> String?) throws -> GTCredentialProvider {
         var attempts = 0
-        var lastPassword: String? = nil
         return GTCredentialProvider { (_, _, _) -> (GTCredential?) in
             var credential: GTCredential? = nil
             
             switch self.credential {
             case let .http(userName):
-                var newPassword = self.passwordStore.gitPassword
-                if newPassword == nil || attempts != 0 {
+                var lastPassword = self.passwordStore.gitPassword
+                if lastPassword == nil || attempts != 0 {
                     if let requestedPassword = requestGitPassword(self.credential, lastPassword) {
-                        newPassword	= requestedPassword
-                        self.passwordStore.gitPassword = newPassword
+                        if SharedDefaults[.isRememberGitCredentialPassphraseOn] {
+                            self.passwordStore.gitPassword = requestedPassword
+                        }
+                        lastPassword = requestedPassword
                     } else {
                         return nil
                     }
                 }
                 attempts += 1
-                lastPassword = newPassword
-                credential = try? GTCredential(userName: userName, password: newPassword!)
+                credential = try? GTCredential(userName: userName, password: lastPassword!)
             case let .ssh(userName, privateKeyFile):
                 // remarks: in fact, attempts > 1 never happens even with the wrong passphrase
-                var newPassword = self.passwordStore.gitSSHPrivateKeyPassphrase
-                if newPassword == nil || attempts != 0  {
+                var lastPassword = self.passwordStore.gitSSHPrivateKeyPassphrase
+                if lastPassword == nil || attempts != 0  {
                     if let requestedPassword = requestGitPassword(self.credential, lastPassword) {
-                        newPassword	= requestedPassword
-                        self.passwordStore.gitSSHPrivateKeyPassphrase = newPassword
+                        if SharedDefaults[.isRememberGitCredentialPassphraseOn] {
+                            self.passwordStore.gitSSHPrivateKeyPassphrase = requestedPassword
+                        }
+                        lastPassword = requestedPassword
                     } else {
                         return nil
                     }
                 }
                 attempts += 1
-                lastPassword = newPassword
-                credential = try? GTCredential(userName: userName, publicKeyURL: nil, privateKeyURL: privateKeyFile, passphrase: newPassword!)
+                credential = try? GTCredential(userName: userName, publicKeyURL: nil, privateKeyURL: privateKeyFile, passphrase: lastPassword!)
             }
             return credential
         }
@@ -66,9 +67,9 @@ public struct GitCredential {
     public func delete() {
         switch credential {
         case .http:
-            Utils.removeKeychain(name: "gitPassword")
+            self.passwordStore.gitPassword = nil
         case .ssh:
-            Utils.removeKeychain(name: "gitSSHKeyPassphrase")
+            self.passwordStore.gitSSHPrivateKeyPassphrase = nil
         }
     }
 }
diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
index 537672a..87b5210 100644
--- a/passKit/Models/PasswordStore.swift
+++ b/passKit/Models/PasswordStore.swift
@@ -120,6 +120,7 @@ public class PasswordStore {
         print(Globals.documentPathLegacy)
         print(Globals.libraryPathLegacy)
         migrateIfNeeded()
+        backwardCompatibility()
         
         do {
             if fm.fileExists(atPath: storeURL.path) {
@@ -166,6 +167,13 @@ public class PasswordStore {
         updatePasswordEntityCoreData()
     }
     
+    private func backwardCompatibility() {
+        // For the newly-introduced isRememberGitCredentialPassphraseOn (20171008)
+        if (self.gitPassword != nil || self.gitSSHPrivateKeyPassphrase != nil) && SharedDefaults[.isRememberGitCredentialPassphraseOn] == false {
+            SharedDefaults[.isRememberGitCredentialPassphraseOn] = true
+        }
+    }
+    
     enum SSHKeyType {
         case `public`, secret
     }
@@ -328,7 +336,6 @@ public class PasswordStore {
             let remote = try GTRemote(name: "origin", in: storeRepository)
             try storeRepository.pull(storeRepository.currentBranch(), from: remote, withOptions: options, progress: transferProgressBlock)
         } catch {
-            credential.delete()
             throw(error)
         }
         DispatchQueue.main.async {
@@ -581,7 +588,6 @@ public class PasswordStore {
                 try storeRepository.push(masterBranch, to: remote, withOptions: options, progress: transferProgressBlock)
             }
         } catch {
-            credential.delete()
             throw(error)
         }
     }
@@ -865,7 +871,7 @@ public class PasswordStore {
         Utils.removeFileIfExists(atPath: Globals.gitSSHPrivateKeyPath)
         Defaults.remove(.gitSSHPrivateKeyArmor)
         Defaults.remove(.gitSSHPrivateKeyURL)
-        Utils.removeKeychain(name: ".gitSSHPrivateKeyPassphrase")
+        self.gitSSHPrivateKeyPassphrase = nil
     }
     
     public func gitSSHKeyExists(inFileSharing: Bool = false) -> Bool {

From eb86b4cb058999000b6212e4a1592ac493d1de9c Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Sun, 8 Oct 2017 22:41:34 +0800
Subject: [PATCH 16/42] Fix backward compatibility of isRememberPGPPassphraseOn

---
 passKit/Models/PasswordStore.swift | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
index 87b5210..55af37f 100644
--- a/passKit/Models/PasswordStore.swift
+++ b/passKit/Models/PasswordStore.swift
@@ -172,6 +172,10 @@ public class PasswordStore {
         if (self.gitPassword != nil || self.gitSSHPrivateKeyPassphrase != nil) && SharedDefaults[.isRememberGitCredentialPassphraseOn] == false {
             SharedDefaults[.isRememberGitCredentialPassphraseOn] = true
         }
+        // For the renamed isRememberPGPPassphraseOn (20171008)
+        if self.pgpKeyPassphrase != nil && SharedDefaults[.isRememberPGPPassphraseOn] == false {
+            SharedDefaults[.isRememberPGPPassphraseOn] = true
+        }
     }
     
     enum SSHKeyType {

From 79744fc713c9efd1764b33ed69386b0881320ef4 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Mon, 9 Oct 2017 20:33:18 -0700
Subject: [PATCH 17/42] Fix QR code scanner cannot be cancelled

---
 pass/Base.lproj/Main.storyboard             | 3 +--
 pass/Controllers/OTPScannerController.swift | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard
index 1cd7a3c..1a3c3ba 100644
--- a/pass/Base.lproj/Main.storyboard
+++ b/pass/Base.lproj/Main.storyboard
@@ -682,7 +682,7 @@
                     <navigationItem key="navigationItem" title="Scan OTP QR Codes" id="Hlb-5I-bfE">
                         <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="KBZ-N2-OGE">
                             <connections>
-                                <segue destination="0gD-ix-2NF" kind="unwind" unwindAction="cancelOTPScannerWithSegue:" id="nZe-B6-MNt"/>
+                                <action selector="pressCancel:" destination="A9p-Qb-WmU" id="SYK-Qh-Cs7"/>
                             </connections>
                         </barButtonItem>
                     </navigationItem>
@@ -691,7 +691,6 @@
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="rqh-SR-bIq" userLabel="First Responder" sceneMemberID="firstResponder"/>
-                <exit id="0gD-ix-2NF" userLabel="Exit" sceneMemberID="exit"/>
             </objects>
             <point key="canvasLocation" x="7059" y="-1012"/>
         </scene>
diff --git a/pass/Controllers/OTPScannerController.swift b/pass/Controllers/OTPScannerController.swift
index 32bcb08..e8fe13d 100644
--- a/pass/Controllers/OTPScannerController.swift
+++ b/pass/Controllers/OTPScannerController.swift
@@ -14,6 +14,9 @@ class OTPScannerController: QRScannerController {
     
     var scannedOTP: String?
     
+    @IBAction func pressCancel(_ sender: UIBarButtonItem) {
+        navigationController?.popViewController(animated: true)
+    }
     // MARK: - AVCaptureMetadataOutputObjectsDelegate Methods
     func captureOutput(_ captureOutput: AVCaptureOutput!, didOutputMetadataObjects metadataObjects: [Any]!, from connection: AVCaptureConnection!) {
         

From 25ab22acc75b43e8f636f6cfc63d1b5a7325acc1 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Mon, 9 Oct 2017 21:19:27 -0700
Subject: [PATCH 18/42] Fix QR code bug introduced by Swift 4 #134

---
 pass/Controllers/QRScannerController.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pass/Controllers/QRScannerController.swift b/pass/Controllers/QRScannerController.swift
index e496229..3972723 100644
--- a/pass/Controllers/QRScannerController.swift
+++ b/pass/Controllers/QRScannerController.swift
@@ -40,7 +40,7 @@ class QRScannerController: UIViewController, AVCaptureMetadataOutputObjectsDeleg
             
             // Initialize the captureSession object.
             captureSession = AVCaptureSession()
-            
+
             // Set the input device on the capture session.
             captureSession?.addInput(input)
             
@@ -90,7 +90,7 @@ class QRScannerController: UIViewController, AVCaptureMetadataOutputObjectsDeleg
     
     // MARK: - AVCaptureMetadataOutputObjectsDelegate Methods
     
-    func metadataOutput(captureOutput: AVCaptureMetadataOutput, didOutput metadataObjects: [AVMetadataObject], from connection: AVCaptureConnection) {
+    func metadataOutput(_ captureOutput: AVCaptureMetadataOutput, didOutput metadataObjects: [AVMetadataObject], from connection: AVCaptureConnection) {
         
         if let metadataObj = metadataObjects.first as? AVMetadataMachineReadableCodeObject,
             supportedCodeTypes.contains(metadataObj.type),

From f5f9fe505bb3b9b0ab7eb077f45903cfcf392c57 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Mon, 9 Oct 2017 22:14:48 -0700
Subject: [PATCH 19/42] Port to Swift 4

---
 pass/Controllers/PasswordEditorTableViewController.swift | 2 +-
 passKit/Models/Password.swift                            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pass/Controllers/PasswordEditorTableViewController.swift b/pass/Controllers/PasswordEditorTableViewController.swift
index ce72409..63cefe2 100644
--- a/pass/Controllers/PasswordEditorTableViewController.swift
+++ b/pass/Controllers/PasswordEditorTableViewController.swift
@@ -104,7 +104,7 @@ class PasswordEditorTableViewController: UITableViewController, FillPasswordTabl
             let minimumLength = lengthSetting?.min ?? 0
             let maximumLength = lengthSetting?.max ?? 0
             var defaultLength = lengthSetting?.def ?? 0
-            if let currentPasswordLength = (tableData[passwordSection][0][PasswordEditorCellKey.content] as? String)?.characters.count,
+            if let currentPasswordLength = (tableData[passwordSection][0][PasswordEditorCellKey.content] as? String)?.count,
                 currentPasswordLength >= minimumLength,
                 currentPasswordLength <= maximumLength {
                 defaultLength = currentPasswordLength
diff --git a/passKit/Models/Password.swift b/passKit/Models/Password.swift
index b1e2426..cae9fee 100644
--- a/passKit/Models/Password.swift
+++ b/passKit/Models/Password.swift
@@ -84,7 +84,7 @@ public class Password {
         additions.removeAll()
         
         // split the plain text
-        let plainTextSplit = plainText.characters.split(maxSplits: 1, omittingEmptySubsequences: false) {
+        let plainTextSplit = plainText.split(maxSplits: 1, omittingEmptySubsequences: false) {
             $0 == "\n" || $0 == "\r\n"
             }.map(String.init)
     
@@ -167,7 +167,7 @@ public class Password {
     
     public func getAdditionsPlainText() -> String {
         // lines starting from the second
-        let plainTextSplit = plainText.characters.split(maxSplits: 1, omittingEmptySubsequences: false) {
+        let plainTextSplit = plainText.split(maxSplits: 1, omittingEmptySubsequences: false) {
             $0 == "\n" || $0 == "\r\n"
             }.map(String.init)
         if plainTextSplit.count == 1 {

From 9b8bdbf5e9fde07db43219f26504767b1a7c4a93 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Mon, 9 Oct 2017 22:15:48 -0700
Subject: [PATCH 20/42] Support ObjectivePGP 0.9.0

---
 Podfile                                         |  2 +-
 .../xcshareddata/xcschemes/pass.xcscheme        |  2 +-
 passKit/Models/PasswordStore.swift              | 17 +++++++++--------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Podfile b/Podfile
index 96091d0..20987bf 100644
--- a/Podfile
+++ b/Podfile
@@ -2,7 +2,7 @@ platform :ios, '10.2'
 use_frameworks!
 
 target 'passKit' do
-    pod 'ObjectivePGP', :git => 'https://github.com/krzyzanowskim/ObjectivePGP.git'
+    pod 'ObjectivePGP', :git => 'https://github.com/krzyzanowskim/ObjectivePGP.git', :tag => '0.9.0'
     target 'pass' do
         inherit! :search_paths
     end
diff --git a/pass.xcodeproj/xcshareddata/xcschemes/pass.xcscheme b/pass.xcodeproj/xcshareddata/xcschemes/pass.xcscheme
index a02e528..75208fd 100644
--- a/pass.xcodeproj/xcshareddata/xcschemes/pass.xcscheme
+++ b/pass.xcodeproj/xcshareddata/xcschemes/pass.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0910"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
index 55af37f..02b602d 100644
--- a/passKit/Models/PasswordStore.swift
+++ b/passKit/Models/PasswordStore.swift
@@ -21,16 +21,16 @@ public class PasswordStore {
     
     public var storeRepository: GTRepository?
     public var pgpKeyID: String?
-    public var publicKey: PGPKey? {
+    public var publicKey: Key? {
         didSet {
             if publicKey != nil {
-                pgpKeyID = publicKey!.keyID.shortKeyString
+                pgpKeyID = publicKey!.keyID.shortIdentifier
             } else {
                 pgpKeyID = nil
             }
         }
     }
-    public var privateKey: PGPKey?
+    public var privateKey: Key?
     
     public var gitSignatureForNow: GTSignature {
         get {
@@ -235,9 +235,10 @@ public class PasswordStore {
     }
     
     
-    private func importKey(from keyPath: String) -> PGPKey? {
+    private func importKey(from keyPath: String) -> Key? {
         if fm.fileExists(atPath: keyPath) {
-            let keys = pgp.importKeys(fromFile: keyPath)
+            let keys = ObjectivePGP.readKeys(from: keyPath)
+            pgp.import(keys: keys)
             if !keys.isEmpty {
                 return keys.first
             }
@@ -245,7 +246,7 @@ public class PasswordStore {
         return nil
     }
 
-    public func getPgpPrivateKey() -> PGPKey {
+    public func getPgpPrivateKey() -> Key {
         return pgp.keys.filter({$0.secretKey != nil})[0]
     }
     
@@ -841,7 +842,7 @@ public class PasswordStore {
         if passphrase == nil {
             passphrase = requestPGPKeyPassphrase()
         }
-        let decryptedData = try PasswordStore.shared.pgp.decryptData(encryptedData, passphrase: passphrase)
+        let decryptedData = try PasswordStore.shared.pgp.decrypt(encryptedData, passphrase: passphrase)
         let plainText = String(data: decryptedData, encoding: .utf8) ?? ""
         let escapedPath = passwordEntity.path!.stringByAddingPercentEncodingForRFC3986() ?? ""
         return Password(name: passwordEntity.name!, url: URL(string: escapedPath), plainText: plainText)
@@ -853,7 +854,7 @@ public class PasswordStore {
             throw AppError.PGPPublicKeyNotExistError
         }
         let plainData = password.getPlainData()
-        let encryptedData = try pgp.encryptData(plainData, using: Array(publicKey), armored: SharedDefaults[.encryptInArmored])
+        let encryptedData = try pgp.encrypt(plainData, using: Array(publicKey), armored: SharedDefaults[.encryptInArmored])
         return encryptedData
     }
     

From d895c1a3c1b41b38260049984c394a74058f5e5d Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Mon, 9 Oct 2017 22:16:05 -0700
Subject: [PATCH 21/42] Fix warning

---
 pass/Helpers/Objective-CBridgingHeader.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pass/Helpers/Objective-CBridgingHeader.h b/pass/Helpers/Objective-CBridgingHeader.h
index e84e32a..3f6e559 100644
--- a/pass/Helpers/Objective-CBridgingHeader.h
+++ b/pass/Helpers/Objective-CBridgingHeader.h
@@ -10,6 +10,6 @@
 #define Objective_CBridgingHeader_h
 
 // #import <ObjectivePGP/ObjectivePGP.h>
-#import <ObjectiveGit/ObjectiveGit.h>
+#import "ObjectiveGit/ObjectiveGit.h"
 
 #endif /* Objective_CBridgingHeader_h */

From b5697922ce2e1cefd59b02efb43fa362cebb2573 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Mon, 9 Oct 2017 23:19:39 -0700
Subject: [PATCH 22/42] Add 1024pt icon for extension

---
 .../AppIcon.appiconset/Contents.json            |   6 ++++++
 .../AppIcon.appiconset/Icon-App-1024@1x.png     | Bin 0 -> 33974 bytes
 2 files changed, 6 insertions(+)
 create mode 100644 passExtension/Assets.xcassets/AppIcon.appiconset/Icon-App-1024@1x.png

diff --git a/passExtension/Assets.xcassets/AppIcon.appiconset/Contents.json b/passExtension/Assets.xcassets/AppIcon.appiconset/Contents.json
index d98c3c4..2a4a51f 100755
--- a/passExtension/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/passExtension/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -143,6 +143,12 @@
       "idiom" : "ipad",
       "filename" : "Icon-App-83.5x83.5@2x.png",
       "scale" : "2x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "Icon-App-1024@1x.png",
+      "scale" : "1x"
     }
   ],
   "info" : {
diff --git a/passExtension/Assets.xcassets/AppIcon.appiconset/Icon-App-1024@1x.png b/passExtension/Assets.xcassets/AppIcon.appiconset/Icon-App-1024@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..161d1e055c9406b05c52615b354ffb26c7fd640d
GIT binary patch
literal 33974
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

literal 0
HcmV?d00001


From c7ab350ad8157d3586db2b5884b7627fda484846 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Tue, 10 Oct 2017 00:35:50 -0700
Subject: [PATCH 23/42] Fix a bug in editing password

The synced attribute of password entity is not set as false after editing a password content.
---
 passKit/Models/PasswordStore.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
index 02b602d..0a6f510 100644
--- a/passKit/Models/PasswordStore.swift
+++ b/passKit/Models/PasswordStore.swift
@@ -674,6 +674,7 @@ public class PasswordStore {
             try gitAdd(path: passwordEntity.getURL()!.path)
             let _ = try gitCommit(message: "Edit password for \(passwordEntity.getURL()!.deletingPathExtension().path.removingPercentEncoding!) to store using Pass for iOS.")
             newPasswordEntity = passwordEntity
+            newPasswordEntity?.synced = false
         }
         
         if password.changed&PasswordChange.path.rawValue != 0 {

From 0f39fa55673d0f148294b719812d396bbe3ec4bd Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Tue, 10 Oct 2017 00:37:50 -0700
Subject: [PATCH 24/42] Show number of local commits in tabbar badge instead of
 title

---
 pass/Controllers/PasswordsViewController.swift | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift
index 58e0bcc..ef12675 100644
--- a/pass/Controllers/PasswordsViewController.swift
+++ b/pass/Controllers/PasswordsViewController.swift
@@ -499,16 +499,13 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
     
     private func reloadTableView(data: [PasswordsTableEntry], anim: CAAnimation? = nil) {
         // set navigation item
-        var numberOfLocalCommitsString = ""
         let numberOfLocalCommits = self.passwordStore.numberOfLocalCommits()
         if numberOfLocalCommits > 0 {
-            numberOfLocalCommitsString = " (\(numberOfLocalCommits))"
+            navigationController?.tabBarItem.badgeValue = "\(numberOfLocalCommits)"
         }
         if parentPasswordEntity != nil {
-            navigationItem.title = "\(parentPasswordEntity!.name!)\(numberOfLocalCommitsString)"
             navigationItem.leftBarButtonItem = backUIBarButtonItem
         } else {
-            navigationItem.title = "Password Store\(numberOfLocalCommitsString)"
             navigationItem.leftBarButtonItem = nil
         }
         

From 479453a7e3f38e4b208fc3ed8dd70c2473e8230e Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Tue, 10 Oct 2017 22:15:10 -0700
Subject: [PATCH 25/42] Remove badge value of tab bar item when
 numberOfLocalCommits is zero

---
 pass/Controllers/PasswordsViewController.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift
index ef12675..be79dba 100644
--- a/pass/Controllers/PasswordsViewController.swift
+++ b/pass/Controllers/PasswordsViewController.swift
@@ -500,7 +500,9 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
     private func reloadTableView(data: [PasswordsTableEntry], anim: CAAnimation? = nil) {
         // set navigation item
         let numberOfLocalCommits = self.passwordStore.numberOfLocalCommits()
-        if numberOfLocalCommits > 0 {
+        if numberOfLocalCommits == 0 {
+            navigationController?.tabBarItem.badgeValue = nil
+        } else {
             navigationController?.tabBarItem.badgeValue = "\(numberOfLocalCommits)"
         }
         if parentPasswordEntity != nil {

From 3ca7b71f4a51de46fce2da1b7f813ed89aa15253 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Tue, 10 Oct 2017 23:01:06 -0700
Subject: [PATCH 26/42] Use "done" style for some button

---
 pass/Base.lproj/Main.storyboard | 126 ++++++++++++++++----------------
 1 file changed, 64 insertions(+), 62 deletions(-)

diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard
index 1a3c3ba..d1f4279 100644
--- a/pass/Base.lproj/Main.storyboard
+++ b/pass/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="YoR-iB-XAd">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13528" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="YoR-iB-XAd">
     <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13526"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -100,11 +100,11 @@
                                         <rect key="frame" x="0.0" y="35" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="55g-T3-9ak" id="dKn-cO-EJa">
-                                            <rect key="frame" x="0.0" y="0.0" width="381" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="General" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dOt-Rj-vWD">
-                                                    <rect key="frame" x="20" y="0.0" width="359" height="43.666666666666664"/>
+                                                    <rect key="frame" x="20" y="0.0" width="356" height="43.666666666666664"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -120,7 +120,7 @@
                                         <rect key="frame" x="0.0" y="79" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2rc-ZW-XKd" id="CpT-zb-QEP">
-                                            <rect key="frame" x="0.0" y="0.0" width="381" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Password Repository" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gWn-ib-STb">
@@ -131,7 +131,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Not Set" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Myq-fV-riz">
-                                                    <rect key="frame" x="321.33333333333331" y="11.999999999999998" width="57.666666666666664" height="20.333333333333332"/>
+                                                    <rect key="frame" x="318.33333333333331" y="11.999999999999998" width="57.666666666666664" height="20.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
@@ -147,7 +147,7 @@
                                         <rect key="frame" x="0.0" y="123" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1ze-MS-Xbj" id="W7U-oL-hOh">
-                                            <rect key="frame" x="0.0" y="0.0" width="381" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="PGP Key" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RR9-xr-9ko">
@@ -158,7 +158,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Not Set" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7lc-Vh-G9W">
-                                                    <rect key="frame" x="321.33333333333331" y="11.999999999999998" width="57.666666666666664" height="20.333333333333332"/>
+                                                    <rect key="frame" x="318.33333333333331" y="11.999999999999998" width="57.666666666666664" height="20.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="calibratedRGB"/>
@@ -175,7 +175,7 @@
                                         <rect key="frame" x="0.0" y="223" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Y0-mj-qhA" id="qlv-tQ-Xmc">
-                                            <rect key="frame" x="0.0" y="0.0" width="381" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Passcode Lock" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RaZ-6t-0CU">
@@ -186,7 +186,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Off" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HXb-ZX-HUv">
-                                                    <rect key="frame" x="354.66666666666669" y="11.999999999999998" width="24.333333333333332" height="20.333333333333332"/>
+                                                    <rect key="frame" x="351.66666666666669" y="11.999999999999998" width="24.333333333333332" height="20.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
@@ -203,7 +203,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Touch ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="H2E-hP-Gyf">
-                                                    <rect key="frame" x="20" y="0.0" width="379" height="43.666666666666664"/>
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.666666666666664"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -220,11 +220,11 @@
                                         <rect key="frame" x="0.0" y="347" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tQN-gu-iRe" id="Xs0-LN-r43">
-                                            <rect key="frame" x="0.0" y="0.0" width="381" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Advanced" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MKj-d0-8q3">
-                                                    <rect key="frame" x="20" y="0.0" width="359" height="43.666666666666664"/>
+                                                    <rect key="frame" x="20" y="0.0" width="356" height="43.666666666666664"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -244,11 +244,11 @@
                                         <rect key="frame" x="0.0" y="427" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="osS-xk-WRP" id="G6j-ij-rNr">
-                                            <rect key="frame" x="0.0" y="0.0" width="381" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="About" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="oqz-Hr-RAl">
-                                                    <rect key="frame" x="20" y="0.0" width="359" height="43.666666666666664"/>
+                                                    <rect key="frame" x="20" y="0.0" width="356" height="43.666666666666664"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -425,13 +425,13 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Password" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LfQ-Af-j2O">
-                                                    <rect key="frame" x="62" y="0.0" width="343" height="44"/>
+                                                    <rect key="frame" x="74" y="3" width="320" height="38.333333333333336"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" tag="1001" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="✓" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Scc-5J-bu1">
-                                                    <rect key="frame" x="23" y="11" width="16" height="22"/>
+                                                    <rect key="frame" x="35" y="11" width="15.666666666666664" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -439,9 +439,10 @@
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="Scc-5J-bu1" firstAttribute="leading" secondItem="1uB-oE-kfI" secondAttribute="leadingMargin" constant="15" id="8Z8-4c-oDD"/>
+                                                <constraint firstItem="LfQ-Af-j2O" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Scc-5J-bu1" secondAttribute="trailing" constant="20" id="I9d-Au-QVj"/>
                                                 <constraint firstItem="LfQ-Af-j2O" firstAttribute="top" secondItem="1uB-oE-kfI" secondAttribute="topMargin" constant="-8" id="OPg-oc-KZy"/>
-                                                <constraint firstItem="LfQ-Af-j2O" firstAttribute="leading" secondItem="1uB-oE-kfI" secondAttribute="leadingMargin" constant="54" id="TCp-fd-Sim"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="LfQ-Af-j2O" secondAttribute="trailing" constant="1" id="dDF-2l-XhB"/>
+                                                <constraint firstItem="LfQ-Af-j2O" firstAttribute="leading" relation="lessThanOrEqual" secondItem="1uB-oE-kfI" secondAttribute="leadingMargin" constant="54" id="TCp-fd-Sim"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="LfQ-Af-j2O" secondAttribute="trailing" id="dDF-2l-XhB"/>
                                                 <constraint firstAttribute="bottomMargin" secondItem="LfQ-Af-j2O" secondAttribute="bottom" constant="-8.3333333333333357" id="e3U-qA-37g"/>
                                                 <constraint firstItem="Scc-5J-bu1" firstAttribute="centerY" secondItem="1uB-oE-kfI" secondAttribute="centerY" id="eyS-Gb-VOi"/>
                                             </constraints>
@@ -452,17 +453,17 @@
                                         <rect key="frame" x="0.0" y="315.33333333333337" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Qmt-bo-CuJ" id="p3u-8b-h3U">
-                                            <rect key="frame" x="0.0" y="0.0" width="367" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="362" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SSH Key" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ezz-76-a53">
-                                                    <rect key="frame" x="62" y="0.0" width="296" height="44"/>
+                                                    <rect key="frame" x="74" y="3" width="279" height="38.333333333333336"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" tag="1001" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="✓" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wbx-rk-i8H">
-                                                    <rect key="frame" x="23" y="11" width="16" height="22"/>
+                                                    <rect key="frame" x="35" y="11" width="16" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -471,10 +472,11 @@
                                             <constraints>
                                                 <constraint firstItem="wbx-rk-i8H" firstAttribute="leading" secondItem="p3u-8b-h3U" secondAttribute="leadingMargin" constant="15" id="1gS-CT-W2C"/>
                                                 <constraint firstAttribute="bottomMargin" secondItem="Ezz-76-a53" secondAttribute="bottom" constant="-8.3333333333333357" id="NW7-VO-yjh"/>
-                                                <constraint firstItem="Ezz-76-a53" firstAttribute="leading" secondItem="p3u-8b-h3U" secondAttribute="leadingMargin" constant="54" id="Ols-7H-4Lb"/>
+                                                <constraint firstItem="Ezz-76-a53" firstAttribute="leading" relation="lessThanOrEqual" secondItem="p3u-8b-h3U" secondAttribute="leadingMargin" constant="54" id="Ols-7H-4Lb"/>
                                                 <constraint firstAttribute="trailingMargin" secondItem="Ezz-76-a53" secondAttribute="trailing" constant="1" id="hLu-eh-HXR"/>
                                                 <constraint firstItem="Ezz-76-a53" firstAttribute="top" secondItem="p3u-8b-h3U" secondAttribute="topMargin" constant="-8" id="jVn-3g-0ax"/>
                                                 <constraint firstItem="wbx-rk-i8H" firstAttribute="centerY" secondItem="p3u-8b-h3U" secondAttribute="centerY" id="jwk-j5-WsJ"/>
+                                                <constraint firstItem="Ezz-76-a53" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="wbx-rk-i8H" secondAttribute="trailing" constant="23" id="xcB-Dt-05o"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -529,13 +531,13 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Public Key URL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dWi-eh-7Eq">
-                                                    <rect key="frame" x="15" y="8" width="391" height="15"/>
+                                                    <rect key="frame" x="27" y="11" width="367" height="15"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Public Key URL" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Rb8-zs-TGa">
-                                                    <rect key="frame" x="15" y="23" width="391" height="21"/>
+                                                    <rect key="frame" x="27" y="26" width="367" height="21"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="URL" returnKeyType="next"/>
@@ -563,13 +565,13 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Private Key URL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qht-RC-Yeg">
-                                                    <rect key="frame" x="15" y="8" width="391" height="15"/>
+                                                    <rect key="frame" x="27" y="11" width="367" height="15"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Private Key URL" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="cGJ-1g-Ztc">
-                                                    <rect key="frame" x="15" y="23" width="391" height="21"/>
+                                                    <rect key="frame" x="27" y="26" width="367" height="21"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="URL" returnKeyType="done"/>
@@ -597,7 +599,7 @@
                         </connections>
                     </tableView>
                     <navigationItem key="navigationItem" title="PGP Key" id="eK3-bb-419">
-                        <barButtonItem key="rightBarButtonItem" systemItem="save" id="TNt-ne-l7W">
+                        <barButtonItem key="rightBarButtonItem" style="done" systemItem="save" id="TNt-ne-l7W">
                             <connections>
                                 <action selector="save:" destination="3WR-HY-zYj" id="uLA-oz-lPI"/>
                             </connections>
@@ -634,7 +636,7 @@
                                 <segue destination="rRf-7l-IGe" kind="unwind" unwindAction="cancelAddPasswordWithSegue:" id="G4F-ci-BmD"/>
                             </connections>
                         </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" systemItem="save" id="FtF-nT-zRJ">
+                        <barButtonItem key="rightBarButtonItem" style="done" systemItem="save" id="FtF-nT-zRJ">
                             <connections>
                                 <segue destination="rRf-7l-IGe" kind="unwind" identifier="saveAddPasswordSegue" unwindAction="saveAddPasswordWithSegue:" id="eVU-Kz-JU0"/>
                             </connections>
@@ -662,10 +664,11 @@
                         <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="lOI-p4-BGb">
-                                <rect key="frame" x="50" y="562" width="314" 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="height" constant="45" id="bdi-FH-dMP"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="300" id="zBX-AY-wU0"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
@@ -675,8 +678,7 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="eYa-Io-fXF" firstAttribute="top" secondItem="lOI-p4-BGb" secondAttribute="bottom" constant="80" id="9iK-9H-fuB"/>
-                            <constraint firstItem="lOI-p4-BGb" firstAttribute="leading" secondItem="a0T-JY-UcS" secondAttribute="leadingMargin" constant="30" id="RCL-aq-Ywc"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="lOI-p4-BGb" secondAttribute="trailing" constant="30" id="qNb-4K-GGl"/>
+                            <constraint firstItem="lOI-p4-BGb" firstAttribute="centerX" secondItem="a0T-JY-UcS" secondAttribute="centerX" id="IVH-ax-fJ3"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Scan OTP QR Codes" id="Hlb-5I-bfE">
@@ -808,7 +810,7 @@
                                 <segue destination="HB6-Yu-Y3J" kind="unwind" unwindAction="cancelEditPasswordWithSegue:" id="B5h-gu-WUv"/>
                             </connections>
                         </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" systemItem="save" id="4l7-58-u8N">
+                        <barButtonItem key="rightBarButtonItem" style="done" systemItem="save" id="4l7-58-u8N">
                             <connections>
                                 <segue destination="HB6-Yu-Y3J" kind="unwind" identifier="saveEditPasswordSegue" unwindAction="saveEditPasswordWithSegue:" id="1sb-Aa-Qdy"/>
                             </connections>
@@ -903,7 +905,7 @@ Phone Support PIN #: 84719</string>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="K0b-qZ-UOk" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="Ber-5V-jaE">
-                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="414" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -934,13 +936,13 @@ Phone Support PIN #: 84719</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Private Key URL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="C2w-dd-roS">
-                                                    <rect key="frame" x="15" y="8" width="391" height="15"/>
+                                                    <rect key="frame" x="27" y="11" width="367" height="15"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Private Key URL" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="4iJ-oB-R1f">
-                                                    <rect key="frame" x="15" y="23" width="391" height="21"/>
+                                                    <rect key="frame" x="27" y="26" width="367" height="21"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="URL" returnKeyType="done"/>
@@ -968,7 +970,7 @@ Phone Support PIN #: 84719</string>
                         </connections>
                     </tableView>
                     <navigationItem key="navigationItem" title="SSH Key" id="DrT-Wk-L5K">
-                        <barButtonItem key="rightBarButtonItem" systemItem="done" id="DEb-eH-FHf">
+                        <barButtonItem key="rightBarButtonItem" style="done" systemItem="done" id="DEb-eH-FHf">
                             <connections>
                                 <action selector="doneButtonTapped:" destination="hqC-Ic-NMi" id="gIV-JX-4hk"/>
                             </connections>
@@ -1011,7 +1013,7 @@ Phone Support PIN #: 84719</string>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="ZUt-x1-TJu" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="Jq6-Yd-xYR">
-                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="414" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -1042,7 +1044,7 @@ Phone Support PIN #: 84719</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Encrypt in ASCII-Armored" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Jwg-mt-woS">
-                                                    <rect key="frame" x="20" y="0.0" width="379" height="43.666666666666664"/>
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.666666666666664"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -1059,7 +1061,7 @@ Phone Support PIN #: 84719</string>
                                         <rect key="frame" x="0.0" y="155.33333333333334" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="SVj-jD-qPT" id="HaO-5w-qZt">
-                                            <rect key="frame" x="0.0" y="0.0" width="381" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Git Signature" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="87a-xY-AbR">
@@ -1070,7 +1072,7 @@ Phone Support PIN #: 84719</string>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Not Set" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2qr-d7-0SK">
-                                                    <rect key="frame" x="321.33333333333331" y="11.999999999999998" width="57.666666666666664" height="20.333333333333332"/>
+                                                    <rect key="frame" x="318.33333333333331" y="11.999999999999998" width="57.666666666666664" height="20.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
@@ -1094,7 +1096,7 @@ Phone Support PIN #: 84719</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Discard All Local Changes" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zrl-v3-fxg">
-                                                    <rect key="frame" x="20" y="0.0" width="379" height="43.666666666666664"/>
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.666666666666664"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.50196081400000003" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -1111,7 +1113,7 @@ Phone Support PIN #: 84719</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Erase All Password Store Data" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="K2K-Bx-g7Z">
-                                                    <rect key="frame" x="20" y="0.0" width="379" height="43.666666666666664"/>
+                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.666666666666664"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.50196081400000003" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -1323,7 +1325,7 @@ Cgo
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oyB-oI-1fS">
-                                                    <rect key="frame" x="15" y="8" width="391" height="144"/>
+                                                    <rect key="frame" x="27" y="11" width="367" height="138"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <fontDescription key="fontDescription" name="Menlo-Regular" family="Menlo" pointSize="8.5"/>
@@ -1361,7 +1363,7 @@ Cgo
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lrQ-Ln-ZOv">
-                                                    <rect key="frame" x="15" y="8" width="391" height="143"/>
+                                                    <rect key="frame" x="27" y="11" width="367" height="138"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <fontDescription key="fontDescription" name="Menlo-Regular" family="Menlo" pointSize="8.5"/>
@@ -1396,7 +1398,7 @@ Cgo
                         </connections>
                     </tableView>
                     <navigationItem key="navigationItem" title="PGP Key" id="V4w-cf-d9g">
-                        <barButtonItem key="rightBarButtonItem" systemItem="save" id="lVZ-mz-KGt">
+                        <barButtonItem key="rightBarButtonItem" style="done" systemItem="save" id="lVZ-mz-KGt">
                             <connections>
                                 <action selector="save:" destination="1gA-jh-frD" id="dfU-DP-Eth"/>
                             </connections>
@@ -1422,7 +1424,7 @@ Cgo
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="ffY-rC-jhq" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="q2R-ll-U4r">
-                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="414" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -1516,7 +1518,7 @@ Cgo
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="23o-MP-wQY">
-                                                    <rect key="frame" x="15" y="8" width="391" height="143"/>
+                                                    <rect key="frame" x="27" y="11" width="367" height="138"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <fontDescription key="fontDescription" name="Menlo-Regular" family="Menlo" pointSize="8.5"/>
@@ -1548,7 +1550,7 @@ Cgo
                         </connections>
                     </tableView>
                     <navigationItem key="navigationItem" title="SSH Key" id="gNq-BH-pj8">
-                        <barButtonItem key="rightBarButtonItem" systemItem="done" id="X6m-eX-dl8">
+                        <barButtonItem key="rightBarButtonItem" style="done" systemItem="done" id="X6m-eX-dl8">
                             <connections>
                                 <action selector="doneButtonTapped:" destination="WgM-cY-mig" id="7Yj-rw-y05"/>
                             </connections>
@@ -1583,13 +1585,13 @@ Cgo
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hlb-Zh-ega">
-                                                    <rect key="frame" x="15" y="8" width="391" height="15"/>
+                                                    <rect key="frame" x="27" y="11" width="367" height="15"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="name" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="fa8-Vc-w8F">
-                                                    <rect key="frame" x="15" y="23" width="391" height="21"/>
+                                                    <rect key="frame" x="27" y="26" width="367" height="21"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" returnKeyType="next"/>
@@ -1616,13 +1618,13 @@ Cgo
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m25-Qy-XwU">
-                                                    <rect key="frame" x="15" y="8" width="391" height="15"/>
+                                                    <rect key="frame" x="27" y="11" width="367" height="15"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="email" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="YY9-za-MNV">
-                                                    <rect key="frame" x="15" y="23" width="391" height="21"/>
+                                                    <rect key="frame" x="27" y="26" width="367" height="21"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="emailAddress" returnKeyType="done"/>
@@ -1650,7 +1652,7 @@ Cgo
                         </connections>
                     </tableView>
                     <navigationItem key="navigationItem" title="Git Signature" id="pPi-jd-x5U">
-                        <barButtonItem key="rightBarButtonItem" systemItem="save" id="kMD-4J-wBb">
+                        <barButtonItem key="rightBarButtonItem" style="done" systemItem="save" id="kMD-4J-wBb">
                             <connections>
                                 <segue destination="M5P-Ab-cIc" kind="unwind" identifier="saveGitConfigSettingSegue" unwindAction="saveGitConfigSettingWithSegue:" id="RGN-ff-tuP"/>
                             </connections>
@@ -1679,9 +1681,10 @@ Cgo
                         <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="50" y="611" width="314" 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"/>
                                     <constraint firstAttribute="height" constant="45" id="q3X-BT-aK8"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -1691,8 +1694,7 @@ Cgo
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstAttribute="trailingMargin" secondItem="U8O-Md-w8e" secondAttribute="trailing" constant="30" id="Sok-Wi-SXQ"/>
-                            <constraint firstItem="U8O-Md-w8e" firstAttribute="leading" secondItem="CA8-A9-019" secondAttribute="leadingMargin" constant="30" id="opY-C9-XIS"/>
+                            <constraint firstItem="U8O-Md-w8e" firstAttribute="centerX" secondItem="CA8-A9-019" secondAttribute="centerX" id="OWy-pk-0Ip"/>
                             <constraint firstItem="53A-gx-tky" firstAttribute="top" secondItem="U8O-Md-w8e" secondAttribute="bottom" constant="80" id="tzL-K0-lE7"/>
                         </constraints>
                     </view>
@@ -1718,9 +1720,10 @@ Cgo
                         <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="fsL-pq-A5q">
-                                <rect key="frame" x="50" y="567" width="314" height="45"/>
+                                <rect key="frame" x="57" y="567" 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="7Qj-pb-GoY"/>
                                     <constraint firstAttribute="height" constant="45" id="IPT-kM-arz"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -1731,8 +1734,7 @@ Cgo
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="QZv-Im-xZk" firstAttribute="top" secondItem="fsL-pq-A5q" secondAttribute="bottom" constant="80" id="76J-7g-eVO"/>
-                            <constraint firstItem="fsL-pq-A5q" firstAttribute="leading" secondItem="GYE-sh-yvu" secondAttribute="leadingMargin" constant="30" id="IOo-JD-FMG"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="fsL-pq-A5q" secondAttribute="trailing" constant="30" id="ymC-G4-bdA"/>
+                            <constraint firstItem="fsL-pq-A5q" firstAttribute="centerX" secondItem="GYE-sh-yvu" secondAttribute="centerX" id="pev-xD-1vH"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Scan SSH Keys" id="bov-FI-Hkg"/>
@@ -1768,7 +1770,7 @@ Cgo
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="0bw-Ed-Xsf" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="D0D-LP-K9m">
-                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="414" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -1786,7 +1788,7 @@ Cgo
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="uoO-MF-fIN" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="HdT-LG-aSd">
-                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="414" height="96"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>

From ced3142291998403d19b618b2bdea36cafc6e795 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Tue, 10 Oct 2017 23:24:44 -0700
Subject: [PATCH 27/42] Open URL without http or https prefix

---
 pass/Controllers/PasswordDetailTableViewController.swift | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pass/Controllers/PasswordDetailTableViewController.swift b/pass/Controllers/PasswordDetailTableViewController.swift
index c69ffc0..4749fd9 100644
--- a/pass/Controllers/PasswordDetailTableViewController.swift
+++ b/pass/Controllers/PasswordDetailTableViewController.swift
@@ -401,7 +401,11 @@ class PasswordDetailTableViewController: UITableViewController, UIGestureRecogni
     }
     
     func openLink() {
-        guard let urlString = self.password?.getURLString(), let url = URL(string: urlString) else {
+        var urlString = self.password?.getURLString() ?? ""
+        if !urlString.lowercased().starts(with: "https://") && !urlString.lowercased().starts(with: "http://") {
+            urlString = "http://\(urlString)"
+        }
+        guard let url = URL(string: urlString) else {
             DispatchQueue.main.async {
                 Utils.alert(title: "Error", message: "Cannot find a valid URL", controller: self, completion: nil)
             }

From 49180d74e63fd6766ee236db67f2de0cd71d8854 Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Sun, 15 Oct 2017 16:49:33 +0800
Subject: [PATCH 28/42] Show folder path in the "add password" view

---
 pass/Controllers/AddPasswordTableViewController.swift | 3 ++-
 pass/Controllers/PasswordsViewController.swift        | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pass/Controllers/AddPasswordTableViewController.swift b/pass/Controllers/AddPasswordTableViewController.swift
index cc82e85..c536f80 100644
--- a/pass/Controllers/AddPasswordTableViewController.swift
+++ b/pass/Controllers/AddPasswordTableViewController.swift
@@ -10,8 +10,8 @@ import UIKit
 import passKit
 
 class AddPasswordTableViewController: PasswordEditorTableViewController {
-    var tempContent: String = ""
     let passwordStore = PasswordStore.shared
+    var defaultDirPrefix = ""
 
     override func viewDidLoad() {
         tableData = [
@@ -24,6 +24,7 @@ class AddPasswordTableViewController: PasswordEditorTableViewController {
             lengthSetting.max > lengthSetting.min {
             tableData[1].append([.type: PasswordEditorCellType.passwordLengthCell, .title: "passwordlength"])
         }
+        tableData[0][0][PasswordEditorCellKey.content] = defaultDirPrefix
         super.viewDidLoad()
     }
     
diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift
index be79dba..55380f3 100644
--- a/pass/Controllers/PasswordsViewController.swift
+++ b/pass/Controllers/PasswordsViewController.swift
@@ -466,6 +466,14 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
                 let passwordEntity = getPasswordEntry(by: selectedIndexPath).passwordEntity!
                 viewController.passwordEntity = passwordEntity
             }
+        } else if segue.identifier == "addPasswordSegue" {
+            if let navController = segue.destination as? UINavigationController {
+                if let viewController = navController.topViewController as? AddPasswordTableViewController {
+                    if let path = parentPasswordEntity?.path {
+                        viewController.defaultDirPrefix = "\(path)/"
+                    }
+                }
+            }
         }
     }
     

From b9ef596bfb23055fb07171c16254509c69dacb8e Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Sun, 15 Oct 2017 21:37:00 +0800
Subject: [PATCH 29/42] Add more password name checks.

---
 .../AddPasswordTableViewController.swift      |  9 +---
 .../EditPasswordTableViewController.swift     | 12 ++----
 .../PasswordEditorTableViewController.swift   | 41 +++++++++++++++++++
 passKit/Helpers/AppError.swift                |  3 ++
 passKit/Models/PasswordStore.swift            |  7 ++++
 5 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/pass/Controllers/AddPasswordTableViewController.swift b/pass/Controllers/AddPasswordTableViewController.swift
index c536f80..e69cfcf 100644
--- a/pass/Controllers/AddPasswordTableViewController.swift
+++ b/pass/Controllers/AddPasswordTableViewController.swift
@@ -39,10 +39,7 @@ class AddPasswordTableViewController: PasswordEditorTableViewController {
             }
             
             // check name
-            guard nameCell?.getContent()?.isEmpty == false else {
-                let alertTitle = "Cannot Add Password"
-                let alertMessage = "Please fill in the name."
-                Utils.alert(title: alertTitle, message: alertMessage, controller: self, completion: nil)
+            guard checkName() == true else {
                 return false
             }
         }
@@ -57,9 +54,7 @@ class AddPasswordTableViewController: PasswordEditorTableViewController {
                 plainText.append("\n")
                 plainText.append(additionsString)
             }
-            let encodedName = (nameCell?.getContent()?.stringByAddingPercentEncodingForRFC3986())!
-            let name = URL(string: encodedName)!.lastPathComponent
-            let url = URL(string: encodedName)!.appendingPathExtension("gpg")
+            let (name, url) = getNameURL()
             password = Password(name: name, url: url, plainText: plainText)
         }
     }
diff --git a/pass/Controllers/EditPasswordTableViewController.swift b/pass/Controllers/EditPasswordTableViewController.swift
index ade537b..1c9cc82 100644
--- a/pass/Controllers/EditPasswordTableViewController.swift
+++ b/pass/Controllers/EditPasswordTableViewController.swift
@@ -27,12 +27,8 @@ class EditPasswordTableViewController: PasswordEditorTableViewController {
     
     override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
         if identifier == "saveEditPasswordSegue" {
-            if let name = nameCell?.getContent(),
-                let path = name.stringByAddingPercentEncodingForRFC3986(),
-                let _ = URL(string: path) {
-                return true
-            } else {
-                Utils.alert(title: "Cannot Save", message: "Password name is invalid.", controller: self, completion: nil)
+            // check name
+            guard checkName() == true else {
                 return false
             }
         }
@@ -47,9 +43,7 @@ class EditPasswordTableViewController: PasswordEditorTableViewController {
                 plainText.append("\n")
                 plainText.append(additionsString)
             }
-            let encodedName = (nameCell?.getContent()?.stringByAddingPercentEncodingForRFC3986())!
-            let name = URL(string: encodedName)!.lastPathComponent
-            let url = URL(string: encodedName)!.appendingPathExtension("gpg")
+            let (name, url) = getNameURL()
             if password!.plainText != plainText || password!.url!.path != url.path {
                 password!.updatePassword(name: name, url: url, plainText: plainText)
             }
diff --git a/pass/Controllers/PasswordEditorTableViewController.swift b/pass/Controllers/PasswordEditorTableViewController.swift
index 63cefe2..e733324 100644
--- a/pass/Controllers/PasswordEditorTableViewController.swift
+++ b/pass/Controllers/PasswordEditorTableViewController.swift
@@ -261,4 +261,45 @@ class PasswordEditorTableViewController: UITableViewController, FillPasswordTabl
             tableData[additionsSection][0][PasswordEditorCellKey.content] = additionsCell?.getContent()
         }
     }
+    
+    func getNameURL() -> (String, URL) {
+        let encodedName = (nameCell?.getContent()?.stringByAddingPercentEncodingForRFC3986())!
+        let name = URL(string: encodedName)!.lastPathComponent
+        let url = URL(string: encodedName)!.appendingPathExtension("gpg")
+        return (name, url)
+    }
+    
+    func checkName() -> Bool {
+        // the name field should not be empty
+        guard let name = nameCell?.getContent(), name.isEmpty == false else {
+            Utils.alert(title: "Cannot Save", message: "Please fill in the name.", controller: self, completion: nil)
+            return false
+        }
+        
+        // the name should not start with /
+        guard name.hasPrefix("/") == false else {
+            Utils.alert(title: "Cannot Save", message: "Please remove the prefix \"/\" from your password name.", controller: self, completion: nil)
+            return false
+        }
+        
+        // the name field should be a valid url
+        guard let path = name.stringByAddingPercentEncodingForRFC3986(),
+            var passwordURL = URL(string: path) else {
+            Utils.alert(title: "Cannot Save", message: "Password name is invalid.", controller: self, completion: nil)
+            return false
+        }
+        
+        // check whether we can parse the filename (be consistent with PasswordStore::addPasswordEntities)
+        var previousURLLength = Int.max
+        while passwordURL.path != "." {
+            passwordURL = passwordURL.deletingLastPathComponent()
+            if passwordURL.absoluteString.count >= previousURLLength {
+                Utils.alert(title: "Cannot Save", message: "Cannot parse the filename. Please check and simplify the password name.", controller: self, completion: nil)
+                return false
+            }
+            previousURLLength = passwordURL.absoluteString.count
+        }
+        
+        return true
+    }
 }
diff --git a/passKit/Helpers/AppError.swift b/passKit/Helpers/AppError.swift
index 6190c66..5386ee1 100644
--- a/passKit/Helpers/AppError.swift
+++ b/passKit/Helpers/AppError.swift
@@ -15,6 +15,7 @@ public enum AppError: Error {
     case PasswordDuplicatedError
     case GitResetError
     case PGPPublicKeyNotExistError
+    case WrongPasswordFilename
     case UnknownError
 }
 
@@ -33,6 +34,8 @@ extension AppError: LocalizedError {
             return "Cannot identify the latest synced commit."
         case .PGPPublicKeyNotExistError:
             return "PGP public key doesn't exist."
+        case .WrongPasswordFilename:
+            return "Cannot write to the password file."
         case .UnknownError:
             return "Unknown error."
         }
diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
index 0a6f510..45ec596 100644
--- a/passKit/Models/PasswordStore.swift
+++ b/passKit/Models/PasswordStore.swift
@@ -603,12 +603,19 @@ public class PasswordStore {
         }
         
         var passwordURL = password.url!
+        var previousURLLength = Int.max
         var paths: [String] = []
         while passwordURL.path != "." {
             paths.append(passwordURL.path)
             passwordURL = passwordURL.deletingLastPathComponent()
+            // better identify errors before saving a new password
+            if passwordURL.absoluteString.count >= previousURLLength {
+                throw AppError.WrongPasswordFilename
+            }
+            previousURLLength = passwordURL.absoluteString.count
         }
         paths.reverse()
+        print(paths)
         var parentPasswordEntity: PasswordEntity? = nil
         for path in paths {
             let isDir = !path.hasSuffix(".gpg")

From f136ebee4828a2e514396db9a83c22525bd15443 Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Sun, 15 Oct 2017 22:36:30 +0800
Subject: [PATCH 30/42] Mark both unsynced files and unsynced folders

---
 pass/Controllers/PasswordsViewController.swift | 12 +++++-------
 passKit/Models/PasswordStore.swift             | 12 +-----------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift
index 55380f3..c4e18c8 100644
--- a/pass/Controllers/PasswordsViewController.swift
+++ b/pass/Controllers/PasswordsViewController.swift
@@ -263,18 +263,16 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
             let cell = tableView.dequeueReusableCell(withIdentifier: "passwordTableViewCell", for: indexPath)
             
             let entry = getPasswordEntry(by: indexPath)
+            if entry.passwordEntity!.synced {
+                cell.textLabel?.text = entry.title
+            } else {
+                cell.textLabel?.text = "↻ \(entry.title)"
+            }
             if !entry.isDir {
-                if entry.passwordEntity!.synced {
-                    cell.textLabel?.text = entry.title
-                } else {
-                    cell.textLabel?.text = "↻ \(entry.title)"
-                }
-                
                 cell.addGestureRecognizer(longPressGestureRecognizer)
                 cell.accessoryType = .none
                 cell.detailTextLabel?.text = ""
             } else {
-                cell.textLabel?.text = "\(entry.title)"
                 cell.accessoryType = .disclosureIndicator
                 cell.detailTextLabel?.font = UIFont.preferredFont(forTextStyle: .body)
                 cell.detailTextLabel?.text = "\(entry.passwordEntity?.children?.count ?? 0)"
diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
index 45ec596..5b98c0e 100644
--- a/passKit/Models/PasswordStore.swift
+++ b/passKit/Models/PasswordStore.swift
@@ -471,17 +471,6 @@ public class PasswordStore {
         }
     }
     
-    public func getNumberOfUnsyncedPasswords() -> Int {
-        let passwordEntityFetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: "PasswordEntity")
-        do {
-            passwordEntityFetchRequest.predicate = NSPredicate(format: "synced = %i", 0)
-            return try context.count(for: passwordEntityFetchRequest)
-        } catch {
-            fatalError("Failed to fetch unsynced passwords: \(error)")
-        }
-    }
-    
-    
     public func getLatestUpdateInfo(filename: String) -> String {
         guard let storeRepository = storeRepository else {
             return "Unknown"
@@ -622,6 +611,7 @@ public class PasswordStore {
             if let passwordEntity = getPasswordEntity(by: path, isDir: isDir) {
                 print(passwordEntity.path!)
                 parentPasswordEntity = passwordEntity
+                passwordEntity.synced = false
             } else {
                 if !isDir {
                     return insertPasswordEntity(name: URL(string: path.stringByAddingPercentEncodingForRFC3986()!)!.deletingPathExtension().lastPathComponent, path: path, parent: parentPasswordEntity, synced: false, isDir: false)

From 9879cef654397fcc023415e7774d65e06aee4103 Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Sun, 15 Oct 2017 23:14:14 +0800
Subject: [PATCH 31/42] Do not use large titles in Settings -> xxx

---
 pass/Base.lproj/Main.storyboard | 100 ++++++++++++++++----------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard
index d1f4279..1d079c4 100644
--- a/pass/Base.lproj/Main.storyboard
+++ b/pass/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13528" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="YoR-iB-XAd">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="YoR-iB-XAd">
     <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13526"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -100,11 +100,11 @@
                                         <rect key="frame" x="0.0" y="35" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="55g-T3-9ak" id="dKn-cO-EJa">
-                                            <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="381" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="General" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dOt-Rj-vWD">
-                                                    <rect key="frame" x="20" y="0.0" width="356" height="43.666666666666664"/>
+                                                    <rect key="frame" x="20" y="0.0" width="359" height="43.666666666666664"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -120,7 +120,7 @@
                                         <rect key="frame" x="0.0" y="79" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2rc-ZW-XKd" id="CpT-zb-QEP">
-                                            <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="381" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Password Repository" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gWn-ib-STb">
@@ -131,7 +131,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Not Set" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Myq-fV-riz">
-                                                    <rect key="frame" x="318.33333333333331" y="11.999999999999998" width="57.666666666666664" height="20.333333333333332"/>
+                                                    <rect key="frame" x="321.33333333333331" y="11.999999999999998" width="57.666666666666664" height="20.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
@@ -147,7 +147,7 @@
                                         <rect key="frame" x="0.0" y="123" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1ze-MS-Xbj" id="W7U-oL-hOh">
-                                            <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="381" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="PGP Key" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RR9-xr-9ko">
@@ -158,7 +158,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Not Set" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7lc-Vh-G9W">
-                                                    <rect key="frame" x="318.33333333333331" y="11.999999999999998" width="57.666666666666664" height="20.333333333333332"/>
+                                                    <rect key="frame" x="321.33333333333331" y="11.999999999999998" width="57.666666666666664" height="20.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="calibratedRGB"/>
@@ -175,7 +175,7 @@
                                         <rect key="frame" x="0.0" y="223" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6Y0-mj-qhA" id="qlv-tQ-Xmc">
-                                            <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="381" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Passcode Lock" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="RaZ-6t-0CU">
@@ -186,7 +186,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Off" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HXb-ZX-HUv">
-                                                    <rect key="frame" x="351.66666666666669" y="11.999999999999998" width="24.333333333333332" height="20.333333333333332"/>
+                                                    <rect key="frame" x="354.66666666666669" y="11.999999999999998" width="24.333333333333332" height="20.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
@@ -203,7 +203,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Touch ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="H2E-hP-Gyf">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.666666666666664"/>
+                                                    <rect key="frame" x="20" y="0.0" width="379" height="43.666666666666664"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -220,11 +220,11 @@
                                         <rect key="frame" x="0.0" y="347" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tQN-gu-iRe" id="Xs0-LN-r43">
-                                            <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="381" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Advanced" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MKj-d0-8q3">
-                                                    <rect key="frame" x="20" y="0.0" width="356" height="43.666666666666664"/>
+                                                    <rect key="frame" x="20" y="0.0" width="359" height="43.666666666666664"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -244,11 +244,11 @@
                                         <rect key="frame" x="0.0" y="427" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="osS-xk-WRP" id="G6j-ij-rNr">
-                                            <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="381" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="About" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="oqz-Hr-RAl">
-                                                    <rect key="frame" x="20" y="0.0" width="356" height="43.666666666666664"/>
+                                                    <rect key="frame" x="20" y="0.0" width="359" height="43.666666666666664"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -425,13 +425,13 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Password" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LfQ-Af-j2O">
-                                                    <rect key="frame" x="74" y="3" width="320" height="38.333333333333336"/>
+                                                    <rect key="frame" x="62" y="0.0" width="344" height="44"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" tag="1001" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="✓" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Scc-5J-bu1">
-                                                    <rect key="frame" x="35" y="11" width="15.666666666666664" height="22"/>
+                                                    <rect key="frame" x="23" y="11" width="15.666666666666664" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -453,17 +453,17 @@
                                         <rect key="frame" x="0.0" y="315.33333333333337" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Qmt-bo-CuJ" id="p3u-8b-h3U">
-                                            <rect key="frame" x="0.0" y="0.0" width="362" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="367" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SSH Key" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ezz-76-a53">
-                                                    <rect key="frame" x="74" y="3" width="279" height="38.333333333333336"/>
+                                                    <rect key="frame" x="62" y="0.0" width="296" height="44"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" tag="1001" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="✓" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wbx-rk-i8H">
-                                                    <rect key="frame" x="35" y="11" width="16" height="22"/>
+                                                    <rect key="frame" x="23" y="11" width="16" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -489,7 +489,7 @@
                         </connections>
                     </tableView>
                     <toolbarItems/>
-                    <navigationItem key="navigationItem" title="Git Server" id="gXX-yl-9oj">
+                    <navigationItem key="navigationItem" title="Git Server" largeTitleDisplayMode="never" id="gXX-yl-9oj">
                         <barButtonItem key="rightBarButtonItem" title="Clone" style="done" id="sgQ-zB-rxv">
                             <connections>
                                 <action selector="save:" destination="ynQ-64-MfA" id="HNL-Da-fXT"/>
@@ -531,13 +531,13 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Public Key URL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dWi-eh-7Eq">
-                                                    <rect key="frame" x="27" y="11" width="367" height="15"/>
+                                                    <rect key="frame" x="15" y="8" width="391" height="15"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Public Key URL" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Rb8-zs-TGa">
-                                                    <rect key="frame" x="27" y="26" width="367" height="21"/>
+                                                    <rect key="frame" x="15" y="23" width="391" height="21"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="URL" returnKeyType="next"/>
@@ -565,13 +565,13 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Private Key URL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qht-RC-Yeg">
-                                                    <rect key="frame" x="27" y="11" width="367" height="15"/>
+                                                    <rect key="frame" x="15" y="8" width="391" height="15"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Private Key URL" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="cGJ-1g-Ztc">
-                                                    <rect key="frame" x="27" y="26" width="367" height="21"/>
+                                                    <rect key="frame" x="15" y="23" width="391" height="21"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="URL" returnKeyType="done"/>
@@ -598,7 +598,7 @@
                             <outlet property="delegate" destination="3WR-HY-zYj" id="kqI-mx-f0D"/>
                         </connections>
                     </tableView>
-                    <navigationItem key="navigationItem" title="PGP Key" id="eK3-bb-419">
+                    <navigationItem key="navigationItem" title="PGP Key" largeTitleDisplayMode="never" id="eK3-bb-419">
                         <barButtonItem key="rightBarButtonItem" style="done" systemItem="save" id="TNt-ne-l7W">
                             <connections>
                                 <action selector="save:" destination="3WR-HY-zYj" id="uLA-oz-lPI"/>
@@ -905,7 +905,7 @@ Phone Support PIN #: 84719</string>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="K0b-qZ-UOk" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="Ber-5V-jaE">
-                        <rect key="frame" x="0.0" y="20" width="414" height="96"/>
+                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -936,13 +936,13 @@ Phone Support PIN #: 84719</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Private Key URL" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="C2w-dd-roS">
-                                                    <rect key="frame" x="27" y="11" width="367" height="15"/>
+                                                    <rect key="frame" x="15" y="8" width="391" height="15"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Private Key URL" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="4iJ-oB-R1f">
-                                                    <rect key="frame" x="27" y="26" width="367" height="21"/>
+                                                    <rect key="frame" x="15" y="23" width="391" height="21"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="URL" returnKeyType="done"/>
@@ -998,7 +998,7 @@ Phone Support PIN #: 84719</string>
                             <outlet property="delegate" destination="ljx-el-KZL" id="suq-rR-a60"/>
                         </connections>
                     </tableView>
-                    <navigationItem key="navigationItem" title="General" id="aAM-Iw-iBA"/>
+                    <navigationItem key="navigationItem" title="General" largeTitleDisplayMode="never" id="aAM-Iw-iBA"/>
                     <connections>
                         <segue destination="RcF-UZ-Tde" kind="show" identifier="showAboutRepositorySegue" id="X49-Em-78M"/>
                     </connections>
@@ -1013,7 +1013,7 @@ Phone Support PIN #: 84719</string>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="ZUt-x1-TJu" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="Jq6-Yd-xYR">
-                        <rect key="frame" x="0.0" y="20" width="414" height="96"/>
+                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -1044,7 +1044,7 @@ Phone Support PIN #: 84719</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Encrypt in ASCII-Armored" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Jwg-mt-woS">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.666666666666664"/>
+                                                    <rect key="frame" x="20" y="0.0" width="379" height="43.666666666666664"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -1061,7 +1061,7 @@ Phone Support PIN #: 84719</string>
                                         <rect key="frame" x="0.0" y="155.33333333333334" width="414" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="SVj-jD-qPT" id="HaO-5w-qZt">
-                                            <rect key="frame" x="0.0" y="0.0" width="376" height="43.666666666666664"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="381" height="43.666666666666664"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Git Signature" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="87a-xY-AbR">
@@ -1072,7 +1072,7 @@ Phone Support PIN #: 84719</string>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Not Set" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2qr-d7-0SK">
-                                                    <rect key="frame" x="318.33333333333331" y="11.999999999999998" width="57.666666666666664" height="20.333333333333332"/>
+                                                    <rect key="frame" x="321.33333333333331" y="11.999999999999998" width="57.666666666666664" height="20.333333333333332"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.5568627451" green="0.5568627451" blue="0.57647058819999997" alpha="1" colorSpace="calibratedRGB"/>
@@ -1096,7 +1096,7 @@ Phone Support PIN #: 84719</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Discard All Local Changes" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zrl-v3-fxg">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.666666666666664"/>
+                                                    <rect key="frame" x="20" y="0.0" width="379" height="43.666666666666664"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.50196081400000003" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -1113,7 +1113,7 @@ Phone Support PIN #: 84719</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Erase All Password Store Data" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="K2K-Bx-g7Z">
-                                                    <rect key="frame" x="20" y="0.0" width="374" height="43.666666666666664"/>
+                                                    <rect key="frame" x="20" y="0.0" width="379" height="43.666666666666664"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.50196081400000003" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -1130,7 +1130,7 @@ Phone Support PIN #: 84719</string>
                             <outlet property="delegate" destination="Rqu-AW-ZNQ" id="FIc-7F-8PL"/>
                         </connections>
                     </tableView>
-                    <navigationItem key="navigationItem" title="Advanced" id="tc7-wf-hG7"/>
+                    <navigationItem key="navigationItem" title="Advanced" largeTitleDisplayMode="never" id="tc7-wf-hG7"/>
                     <connections>
                         <outlet property="discardChangesTableViewCell" destination="Jm8-B5-wKx" id="rfA-G3-2OE"/>
                         <outlet property="encryptInASCIIArmoredTableViewCell" destination="tHt-Ro-0HF" id="tOi-Sj-mLJ"/>
@@ -1156,7 +1156,7 @@ Phone Support PIN #: 84719</string>
                             <outlet property="delegate" destination="ZcQ-fs-QEW" id="GET-cd-P5Q"/>
                         </connections>
                     </tableView>
-                    <navigationItem key="navigationItem" title="About" id="Pel-JD-Z5x"/>
+                    <navigationItem key="navigationItem" title="About" largeTitleDisplayMode="never" id="Pel-JD-Z5x"/>
                     <connections>
                         <segue destination="yb5-mG-DI8" kind="show" identifier="showOpenSourceComponentsSegue" id="1lz-OC-pgC"/>
                         <segue destination="NEk-KW-Ogp" kind="show" identifier="showSpecialThanksSegue" id="nzG-Je-gqo"/>
@@ -1325,7 +1325,7 @@ Cgo
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oyB-oI-1fS">
-                                                    <rect key="frame" x="27" y="11" width="367" height="138"/>
+                                                    <rect key="frame" x="15" y="8" width="391" height="143.66666666666666"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <fontDescription key="fontDescription" name="Menlo-Regular" family="Menlo" pointSize="8.5"/>
@@ -1363,7 +1363,7 @@ Cgo
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lrQ-Ln-ZOv">
-                                                    <rect key="frame" x="27" y="11" width="367" height="138"/>
+                                                    <rect key="frame" x="15" y="8" width="391" height="143.66666666666666"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <fontDescription key="fontDescription" name="Menlo-Regular" family="Menlo" pointSize="8.5"/>
@@ -1397,7 +1397,7 @@ Cgo
                             <outlet property="delegate" destination="1gA-jh-frD" id="jKb-Ie-lOh"/>
                         </connections>
                     </tableView>
-                    <navigationItem key="navigationItem" title="PGP Key" id="V4w-cf-d9g">
+                    <navigationItem key="navigationItem" title="PGP Key" largeTitleDisplayMode="never" id="V4w-cf-d9g">
                         <barButtonItem key="rightBarButtonItem" style="done" systemItem="save" id="lVZ-mz-KGt">
                             <connections>
                                 <action selector="save:" destination="1gA-jh-frD" id="dfU-DP-Eth"/>
@@ -1424,7 +1424,7 @@ Cgo
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="ffY-rC-jhq" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="q2R-ll-U4r">
-                        <rect key="frame" x="0.0" y="20" width="414" height="96"/>
+                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -1518,7 +1518,7 @@ Cgo
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="23o-MP-wQY">
-                                                    <rect key="frame" x="27" y="11" width="367" height="138"/>
+                                                    <rect key="frame" x="15" y="8" width="391" height="143.66666666666666"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <fontDescription key="fontDescription" name="Menlo-Regular" family="Menlo" pointSize="8.5"/>
@@ -1585,13 +1585,13 @@ Cgo
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hlb-Zh-ega">
-                                                    <rect key="frame" x="27" y="11" width="367" height="15"/>
+                                                    <rect key="frame" x="15" y="8" width="391" height="15"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="name" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="fa8-Vc-w8F">
-                                                    <rect key="frame" x="27" y="26" width="367" height="21"/>
+                                                    <rect key="frame" x="15" y="23" width="391" height="21"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" returnKeyType="next"/>
@@ -1618,13 +1618,13 @@ Cgo
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m25-Qy-XwU">
-                                                    <rect key="frame" x="27" y="11" width="367" height="15"/>
+                                                    <rect key="frame" x="15" y="8" width="391" height="15"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="email" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="YY9-za-MNV">
-                                                    <rect key="frame" x="27" y="26" width="367" height="21"/>
+                                                    <rect key="frame" x="15" y="23" width="391" height="21"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                                     <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" keyboardType="emailAddress" returnKeyType="done"/>
@@ -1681,7 +1681,7 @@ Cgo
                         <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="562" width="300" height="45"/>
+                                <rect key="frame" x="57" y="611" 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"/>
@@ -1770,7 +1770,7 @@ Cgo
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="0bw-Ed-Xsf" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="D0D-LP-K9m">
-                        <rect key="frame" x="0.0" y="20" width="414" height="96"/>
+                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>
@@ -1788,7 +1788,7 @@ Cgo
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="uoO-MF-fIN" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="HdT-LG-aSd">
-                        <rect key="frame" x="0.0" y="20" width="414" height="96"/>
+                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>

From 54bd42d2fb4cab33ddcda9949ea3d2c37149e821 Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Mon, 16 Oct 2017 04:14:11 +0800
Subject: [PATCH 32/42] Fix a bug in file name checking

---
 pass/Controllers/PasswordEditorTableViewController.swift | 6 +++---
 passKit/Models/PasswordStore.swift                       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pass/Controllers/PasswordEditorTableViewController.swift b/pass/Controllers/PasswordEditorTableViewController.swift
index e733324..7ed2ed6 100644
--- a/pass/Controllers/PasswordEditorTableViewController.swift
+++ b/pass/Controllers/PasswordEditorTableViewController.swift
@@ -290,14 +290,14 @@ class PasswordEditorTableViewController: UITableViewController, FillPasswordTabl
         }
         
         // check whether we can parse the filename (be consistent with PasswordStore::addPasswordEntities)
-        var previousURLLength = Int.max
+        var previousPathLength = Int.max
         while passwordURL.path != "." {
             passwordURL = passwordURL.deletingLastPathComponent()
-            if passwordURL.absoluteString.count >= previousURLLength {
+            if passwordURL.path != "." && passwordURL.path.count >= previousPathLength {
                 Utils.alert(title: "Cannot Save", message: "Cannot parse the filename. Please check and simplify the password name.", controller: self, completion: nil)
                 return false
             }
-            previousURLLength = passwordURL.absoluteString.count
+            previousPathLength = passwordURL.path.count
         }
         
         return true
diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
index 5b98c0e..37e2718 100644
--- a/passKit/Models/PasswordStore.swift
+++ b/passKit/Models/PasswordStore.swift
@@ -592,16 +592,16 @@ public class PasswordStore {
         }
         
         var passwordURL = password.url!
-        var previousURLLength = Int.max
+        var previousPathLength = Int.max
         var paths: [String] = []
         while passwordURL.path != "." {
             paths.append(passwordURL.path)
             passwordURL = passwordURL.deletingLastPathComponent()
             // better identify errors before saving a new password
-            if passwordURL.absoluteString.count >= previousURLLength {
+            if passwordURL.path != "." && passwordURL.path.count >= previousPathLength {
                 throw AppError.WrongPasswordFilename
             }
-            previousURLLength = passwordURL.absoluteString.count
+            previousPathLength = passwordURL.path.count
         }
         paths.reverse()
         print(paths)

From 31172a19850b0d64c9fcbb25f854b1b5f7cf5718 Mon Sep 17 00:00:00 2001
From: Danny Moesch <danny.moesch@icloud.com>
Date: Thu, 19 Oct 2017 11:47:49 +0200
Subject: [PATCH 33/42] Correct commit message used after editing a password

---
 passKit/Models/PasswordStore.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passKit/Models/PasswordStore.swift b/passKit/Models/PasswordStore.swift
index 37e2718..945cb32 100644
--- a/passKit/Models/PasswordStore.swift
+++ b/passKit/Models/PasswordStore.swift
@@ -669,7 +669,7 @@ public class PasswordStore {
             let saveURL = storeURL.appendingPathComponent(passwordEntity.getURL()!.path)
             try self.encrypt(password: password).write(to: saveURL)
             try gitAdd(path: passwordEntity.getURL()!.path)
-            let _ = try gitCommit(message: "Edit password for \(passwordEntity.getURL()!.deletingPathExtension().path.removingPercentEncoding!) to store using Pass for iOS.")
+            let _ = try gitCommit(message: "Edit password for \(passwordEntity.getURL()!.deletingPathExtension().path.removingPercentEncoding!) using Pass for iOS.")
             newPasswordEntity = passwordEntity
             newPasswordEntity?.synced = false
         }

From 2a0822f727d9758c218edb7b453058f35e0d2eec Mon Sep 17 00:00:00 2001
From: Danny Moesch <danny.moesch@icloud.com>
Date: Thu, 19 Oct 2017 11:28:51 +0200
Subject: [PATCH 34/42] Change "Show Folder" -> "Show Folders"

---
 pass/Controllers/GeneralSettingsTableViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pass/Controllers/GeneralSettingsTableViewController.swift b/pass/Controllers/GeneralSettingsTableViewController.swift
index 209c5ed..f74375e 100644
--- a/pass/Controllers/GeneralSettingsTableViewController.swift
+++ b/pass/Controllers/GeneralSettingsTableViewController.swift
@@ -71,7 +71,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
                 [.title: "Remember Git Credential Passphrase", .action: "none",],
             ],
             [
-                [.title: "Show Folder", .action: "none",],
+                [.title: "Show Folders", .action: "none",],
                 [.title: "Hide Unknown Fields", .action: "none",],
                 [.title: "Hide OTP Fields", .action: "none",],
             ],

From 14544a6d5aab18be1ba631b5652f488d1421ba6b Mon Sep 17 00:00:00 2001
From: Danny Moesch <danny.moesch@icloud.com>
Date: Thu, 19 Oct 2017 11:35:57 +0200
Subject: [PATCH 35/42] Fix typo in explanation of ASCII-armored keys and use
 only "-a" instead of "--armor"

---
 pass/Base.lproj/Main.storyboard | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard
index 1d079c4..cdbb4b6 100644
--- a/pass/Base.lproj/Main.storyboard
+++ b/pass/Base.lproj/Main.storyboard
@@ -1272,7 +1272,7 @@ Phone Support PIN #: 84719</string>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <attributedString key="attributedText">
                                                         <fragment>
-                                                            <string key="content">GnuPG supports a command-line option --armor that that causes output to be generated in an ASCII-armored format similar to unencoded documents rather than the binary format.
+                                                            <string key="content">GnuPG supports the command-line option "-a" that causes output to be generated in an ASCII-armored format similar to unencoded documents rather than the binary format.
 
 </string>
                                                             <attributes>

From 3afab7b54f79966df8d9cec84145dc629e6fe096 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Thu, 19 Oct 2017 23:00:21 -0700
Subject: [PATCH 36/42] Fix warning

---
 pass/Helpers/Objective-CBridgingHeader.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pass/Helpers/Objective-CBridgingHeader.h b/pass/Helpers/Objective-CBridgingHeader.h
index 3f6e559..5a04d04 100644
--- a/pass/Helpers/Objective-CBridgingHeader.h
+++ b/pass/Helpers/Objective-CBridgingHeader.h
@@ -9,7 +9,7 @@
 #ifndef Objective_CBridgingHeader_h
 #define Objective_CBridgingHeader_h
 
-// #import <ObjectivePGP/ObjectivePGP.h>
+#import "ObjectivePGP/ObjectivePGP.h"
 #import "ObjectiveGit/ObjectiveGit.h"
 
 #endif /* Objective_CBridgingHeader_h */

From 3380f418557523aff6cbc0cd7f9d8e1763333798 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Thu, 19 Oct 2017 23:02:36 -0700
Subject: [PATCH 37/42] Fix typo

---
 pass/Controllers/GeneralSettingsTableViewController.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pass/Controllers/GeneralSettingsTableViewController.swift b/pass/Controllers/GeneralSettingsTableViewController.swift
index f74375e..f0b57de 100644
--- a/pass/Controllers/GeneralSettingsTableViewController.swift
+++ b/pass/Controllers/GeneralSettingsTableViewController.swift
@@ -116,7 +116,7 @@ class GeneralSettingsTableViewController: BasicStaticTableViewController {
             cell.accessoryType = .none
             cell.selectionStyle = .none
             cell.accessoryView = rememberGitCredentialPassphraseSwitch
-        case "Show Folder":
+        case "Show Folders":
             cell.accessoryType = .none
             cell.selectionStyle = .none
             cell.accessoryView = showFolderSwitch

From 15ed7aaf2f4d766080865f8ea35f38fd491ff8f4 Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Sat, 28 Oct 2017 15:32:30 +0800
Subject: [PATCH 38/42] Update Safari extension search logic #138

- Match the entered text in each pathname levels
---
 passExtension/ExtensionViewController.swift | 25 ++++++++++++++-------
 passKit/Models/PasswordEntity.swift         |  6 ++++-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/passExtension/ExtensionViewController.swift b/passExtension/ExtensionViewController.swift
index a37912d..6e2d67e 100644
--- a/passExtension/ExtensionViewController.swift
+++ b/passExtension/ExtensionViewController.swift
@@ -12,10 +12,14 @@ import passKit
 
 fileprivate class PasswordsTableEntry : NSObject {
     var title: String
+    var categoryText: String
+    var categoryArray: [String]
     var passwordEntity: PasswordEntity?
-    init(title: String, passwordEntity: PasswordEntity?) {
-        self.title = title
-        self.passwordEntity = passwordEntity
+    init(_ entity: PasswordEntity) {
+        self.title = entity.name!
+        self.categoryText = entity.getCategoryText()
+        self.categoryArray = entity.getCategoryArray()
+        self.passwordEntity = entity
     }
 }
 
@@ -46,7 +50,7 @@ class ExtensionViewController: UIViewController, UITableViewDataSource, UITableV
         var passwordEntities = [PasswordEntity]()
         passwordEntities = self.passwordStore.fetchPasswordEntityCoreData(withDir: false)
         passwordsTableEntries = passwordEntities.map {
-            PasswordsTableEntry(title: $0.name!, passwordEntity: $0)
+            PasswordsTableEntry($0)
         }
     }
     
@@ -141,7 +145,7 @@ class ExtensionViewController: UIViewController, UITableViewDataSource, UITableV
         }
         cell.accessoryType = .none
         cell.detailTextLabel?.font = UIFont.preferredFont(forTextStyle: .footnote)
-        cell.detailTextLabel?.text = entry.passwordEntity?.getCategoryText()
+        cell.detailTextLabel?.text = entry.categoryText
         return cell
     }
     
@@ -241,10 +245,15 @@ class ExtensionViewController: UIViewController, UITableViewDataSource, UITableV
     
     func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
         if let searchText = searchBar.text, searchText.isEmpty == false {
-            let searchTextLowerCased = searchText.lowercased()
             filteredPasswordsTableEntries = passwordsTableEntries.filter { entry in
-                let entryTitle = entry.title.lowercased()
-                return entryTitle.contains(searchTextLowerCased) || searchTextLowerCased.contains(entryTitle)
+                var matched = false
+                matched = matched || entry.title.range(of: searchText, options: .caseInsensitive) != nil
+                matched = matched || searchText.range(of: entry.title, options: .caseInsensitive) != nil
+                entry.categoryArray.forEach({ (category) in
+                    matched = matched || category.range(of: searchText, options: .caseInsensitive) != nil
+                    matched = matched || searchText.range(of: category, options: .caseInsensitive) != nil
+                })
+                return matched
             }
             searchActive = true
         } else {
diff --git a/passKit/Models/PasswordEntity.swift b/passKit/Models/PasswordEntity.swift
index 645dba8..5678ce4 100644
--- a/passKit/Models/PasswordEntity.swift
+++ b/passKit/Models/PasswordEntity.swift
@@ -22,6 +22,10 @@ extension PasswordEntity {
     }
     
     public func getCategoryText() -> String {
+        return getCategoryArray().joined(separator: " > ")
+    }
+    
+    public func getCategoryArray() -> [String] {
         var parentEntity = parent
         var passwordCategoryArray: [String] = []
         while parentEntity != nil {
@@ -29,7 +33,7 @@ extension PasswordEntity {
             parentEntity = parentEntity!.parent
         }
         passwordCategoryArray.reverse()
-        return passwordCategoryArray.joined(separator: " > ")
+        return passwordCategoryArray
     }
     
     public func getURL() -> URL? {

From ed246b32797892a2e3ae8aeb5a3415561166ce1b Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Sat, 28 Oct 2017 17:58:13 +0800
Subject: [PATCH 39/42] Update the Swift badge in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d10c16b..5809e7c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Pass
 [![GitHub release](https://img.shields.io/github/release/mssun/pass-ios.svg)](https://github.com/mssun/pass-ios/releases)
-![Swift 3.1](https://img.shields.io/badge/Swift-3.1-orange.svg)
+![Swift 3.1](https://img.shields.io/badge/Swift-4.0-orange.svg)
 [![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/passforios/passforios)
 [![Build Status](https://travis-ci.org/mssun/passforios.svg?branch=develop)](https://travis-ci.org/mssun/passforios)
 [![Donate](https://img.shields.io/badge/Paypal-donate-blue.svg)](https://www.paypal.me/mssun)

From 1e737733dddee16f1559e8e6478d31cd93661bbb Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Sat, 28 Oct 2017 18:23:15 +0800
Subject: [PATCH 40/42] Add App Store badge

---
 README.md                 |  11 +++-
 badge/app_store_badge.svg | 129 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+), 3 deletions(-)
 create mode 100644 badge/app_store_badge.svg

diff --git a/README.md b/README.md
index 5809e7c..73a639f 100644
--- a/README.md
+++ b/README.md
@@ -11,9 +11,14 @@ Pass is an iOS client compatible with [ZX2C4's Pass command line
 application](http://www.passwordstore.org/).  It is a password manager using
 GPG for encryption and Git for version control.
 
-Pass for iOS is available in the [App Store](https://appsto.re/us/DY13hb.i)
-with the name "Pass - Password Store".  If you want to join the iOS beta via 
-Testflight, drop an email to `developer@passforios.mssun.me`. Thank you.
+Pass for iOS is available in the App Store with the name "Pass - Password Store".
+
+<p>
+<a href="https://itunes.apple.com/us/app/pass-password-store/id1205820573?mt=8"><img alt="Download on the App Store" src="badge/app_store_badge.svg" width="150"/></a>
+</p>
+
+If you want to join the iOS beta via 
+TestFlight, drop an email to `developer@passforios.mssun.me`. Thank you.
 
 ## Features
 
diff --git a/badge/app_store_badge.svg b/badge/app_store_badge.svg
new file mode 100644
index 0000000..ac111e5
--- /dev/null
+++ b/badge/app_store_badge.svg
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="US_UK_Download_on_the" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" width="135px" height="40px" viewBox="0 0 135 40" enable-background="new 0 0 135 40" xml:space="preserve">
+<g>
+	<path fill="#A6A6A6" d="M130.197,40H4.729C2.122,40,0,37.872,0,35.267V4.726C0,2.12,2.122,0,4.729,0h125.468
+		C132.803,0,135,2.12,135,4.726v30.541C135,37.872,132.803,40,130.197,40L130.197,40z"/>
+	<path d="M134.032,35.268c0,2.116-1.714,3.83-3.834,3.83H4.729c-2.119,0-3.839-1.714-3.839-3.83V4.725
+		c0-2.115,1.72-3.835,3.839-3.835h125.468c2.121,0,3.834,1.72,3.834,3.835L134.032,35.268L134.032,35.268z"/>
+	<g>
+		<g>
+			<path fill="#FFFFFF" d="M30.128,19.784c-0.029-3.223,2.639-4.791,2.761-4.864c-1.511-2.203-3.853-2.504-4.676-2.528
+				c-1.967-0.207-3.875,1.177-4.877,1.177c-1.022,0-2.565-1.157-4.228-1.123c-2.14,0.033-4.142,1.272-5.24,3.196
+				c-2.266,3.923-0.576,9.688,1.595,12.859c1.086,1.553,2.355,3.287,4.016,3.226c1.625-0.067,2.232-1.036,4.193-1.036
+				c1.943,0,2.513,1.036,4.207,0.997c1.744-0.028,2.842-1.56,3.89-3.127c1.255-1.78,1.759-3.533,1.779-3.623
+				C33.507,24.924,30.161,23.647,30.128,19.784z"/>
+			<path fill="#FFFFFF" d="M26.928,10.306c0.874-1.093,1.472-2.58,1.306-4.089c-1.265,0.056-2.847,0.875-3.758,1.944
+				c-0.806,0.942-1.526,2.486-1.34,3.938C24.557,12.205,26.016,11.382,26.928,10.306z"/>
+		</g>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M53.645,31.504h-2.271l-1.244-3.909h-4.324l-1.185,3.909h-2.211l4.284-13.308h2.646L53.645,31.504z
+			 M49.755,25.955L48.63,22.48c-0.119-0.355-0.342-1.191-0.671-2.507h-0.04c-0.131,0.566-0.342,1.402-0.632,2.507l-1.105,3.475
+			H49.755z"/>
+		<path fill="#FFFFFF" d="M64.662,26.588c0,1.632-0.441,2.922-1.323,3.869c-0.79,0.843-1.771,1.264-2.942,1.264
+			c-1.264,0-2.172-0.454-2.725-1.362h-0.04v5.055h-2.132V25.067c0-1.026-0.027-2.079-0.079-3.159h1.875l0.119,1.521h0.04
+			c0.711-1.146,1.79-1.718,3.238-1.718c1.132,0,2.077,0.447,2.833,1.342C64.284,23.949,64.662,25.127,64.662,26.588z M62.49,26.666
+			c0-0.934-0.21-1.704-0.632-2.31c-0.461-0.632-1.08-0.948-1.856-0.948c-0.526,0-1.004,0.176-1.431,0.523
+			c-0.428,0.35-0.708,0.807-0.839,1.373c-0.066,0.264-0.099,0.48-0.099,0.65v1.6c0,0.698,0.214,1.287,0.642,1.768
+			s0.984,0.721,1.668,0.721c0.803,0,1.428-0.31,1.875-0.928C62.266,28.496,62.49,27.68,62.49,26.666z"/>
+		<path fill="#FFFFFF" d="M75.699,26.588c0,1.632-0.441,2.922-1.324,3.869c-0.789,0.843-1.77,1.264-2.941,1.264
+			c-1.264,0-2.172-0.454-2.724-1.362H68.67v5.055h-2.132V25.067c0-1.026-0.027-2.079-0.079-3.159h1.875l0.119,1.521h0.04
+			c0.71-1.146,1.789-1.718,3.238-1.718c1.131,0,2.076,0.447,2.834,1.342C75.32,23.949,75.699,25.127,75.699,26.588z M73.527,26.666
+			c0-0.934-0.211-1.704-0.633-2.31c-0.461-0.632-1.078-0.948-1.855-0.948c-0.527,0-1.004,0.176-1.432,0.523
+			c-0.428,0.35-0.707,0.807-0.838,1.373c-0.065,0.264-0.099,0.48-0.099,0.65v1.6c0,0.698,0.214,1.287,0.64,1.768
+			c0.428,0.48,0.984,0.721,1.67,0.721c0.803,0,1.428-0.31,1.875-0.928C73.303,28.496,73.527,27.68,73.527,26.666z"/>
+		<path fill="#FFFFFF" d="M88.039,27.772c0,1.132-0.393,2.053-1.182,2.764c-0.867,0.777-2.074,1.165-3.625,1.165
+			c-1.432,0-2.58-0.276-3.449-0.829l0.494-1.777c0.936,0.566,1.963,0.85,3.082,0.85c0.803,0,1.428-0.182,1.877-0.544
+			c0.447-0.362,0.67-0.848,0.67-1.454c0-0.54-0.184-0.995-0.553-1.364c-0.367-0.369-0.98-0.712-1.836-1.029
+			c-2.33-0.869-3.494-2.142-3.494-3.816c0-1.094,0.408-1.991,1.225-2.689c0.814-0.699,1.9-1.048,3.258-1.048
+			c1.211,0,2.217,0.211,3.02,0.632l-0.533,1.738c-0.75-0.408-1.598-0.612-2.547-0.612c-0.75,0-1.336,0.185-1.756,0.553
+			c-0.355,0.329-0.533,0.73-0.533,1.205c0,0.526,0.203,0.961,0.611,1.303c0.355,0.316,1,0.658,1.936,1.027
+			c1.145,0.461,1.986,1,2.527,1.618C87.77,26.081,88.039,26.852,88.039,27.772z"/>
+		<path fill="#FFFFFF" d="M95.088,23.508h-2.35v4.659c0,1.185,0.414,1.777,1.244,1.777c0.381,0,0.697-0.033,0.947-0.099l0.059,1.619
+			c-0.42,0.157-0.973,0.236-1.658,0.236c-0.842,0-1.5-0.257-1.975-0.77c-0.473-0.514-0.711-1.376-0.711-2.587v-4.837h-1.4v-1.6h1.4
+			v-1.757l2.094-0.632v2.389h2.35V23.508z"/>
+		<path fill="#FFFFFF" d="M105.691,26.627c0,1.475-0.422,2.686-1.264,3.633c-0.883,0.975-2.055,1.461-3.516,1.461
+			c-1.408,0-2.529-0.467-3.365-1.401s-1.254-2.113-1.254-3.534c0-1.487,0.43-2.705,1.293-3.652c0.861-0.948,2.023-1.422,3.484-1.422
+			c1.408,0,2.541,0.467,3.396,1.402C105.283,24.021,105.691,25.192,105.691,26.627z M103.479,26.696
+			c0-0.885-0.189-1.644-0.572-2.277c-0.447-0.766-1.086-1.148-1.914-1.148c-0.857,0-1.508,0.383-1.955,1.148
+			c-0.383,0.634-0.572,1.405-0.572,2.317c0,0.885,0.189,1.644,0.572,2.276c0.461,0.766,1.105,1.148,1.936,1.148
+			c0.814,0,1.453-0.39,1.914-1.168C103.281,28.347,103.479,27.58,103.479,26.696z"/>
+		<path fill="#FFFFFF" d="M112.621,23.783c-0.211-0.039-0.436-0.059-0.672-0.059c-0.75,0-1.33,0.283-1.738,0.85
+			c-0.355,0.5-0.533,1.132-0.533,1.895v5.035h-2.131l0.02-6.574c0-1.106-0.027-2.113-0.08-3.021h1.857l0.078,1.836h0.059
+			c0.225-0.631,0.58-1.139,1.066-1.52c0.475-0.343,0.988-0.514,1.541-0.514c0.197,0,0.375,0.014,0.533,0.039V23.783z"/>
+		<path fill="#FFFFFF" d="M122.156,26.252c0,0.382-0.025,0.704-0.078,0.967h-6.396c0.025,0.948,0.334,1.673,0.928,2.173
+			c0.539,0.447,1.236,0.671,2.092,0.671c0.947,0,1.811-0.151,2.588-0.454l0.334,1.48c-0.908,0.396-1.98,0.593-3.217,0.593
+			c-1.488,0-2.656-0.438-3.506-1.313c-0.848-0.875-1.273-2.05-1.273-3.524c0-1.447,0.395-2.652,1.186-3.613
+			c0.828-1.026,1.947-1.539,3.355-1.539c1.383,0,2.43,0.513,3.141,1.539C121.873,24.047,122.156,25.055,122.156,26.252z
+			 M120.123,25.699c0.014-0.632-0.125-1.178-0.414-1.639c-0.369-0.593-0.936-0.889-1.699-0.889c-0.697,0-1.264,0.289-1.697,0.869
+			c-0.355,0.461-0.566,1.014-0.631,1.658H120.123z"/>
+	</g>
+	<g>
+		<g>
+			<path fill="#FFFFFF" d="M49.05,10.009c0,1.177-0.353,2.063-1.058,2.658c-0.653,0.549-1.581,0.824-2.783,0.824
+				c-0.596,0-1.106-0.026-1.533-0.078V6.982c0.557-0.09,1.157-0.136,1.805-0.136c1.145,0,2.008,0.249,2.59,0.747
+				C48.723,8.156,49.05,8.961,49.05,10.009z M47.945,10.038c0-0.763-0.202-1.348-0.606-1.756c-0.404-0.407-0.994-0.611-1.771-0.611
+				c-0.33,0-0.611,0.022-0.844,0.068v4.889c0.129,0.02,0.365,0.029,0.708,0.029c0.802,0,1.421-0.223,1.857-0.669
+				S47.945,10.892,47.945,10.038z"/>
+			<path fill="#FFFFFF" d="M54.909,11.037c0,0.725-0.207,1.319-0.621,1.785c-0.434,0.479-1.009,0.718-1.727,0.718
+				c-0.692,0-1.243-0.229-1.654-0.689c-0.41-0.459-0.615-1.038-0.615-1.736c0-0.73,0.211-1.329,0.635-1.794s0.994-0.698,1.712-0.698
+				c0.692,0,1.248,0.229,1.669,0.688C54.708,9.757,54.909,10.333,54.909,11.037z M53.822,11.071c0-0.435-0.094-0.808-0.281-1.119
+				c-0.22-0.376-0.533-0.564-0.94-0.564c-0.421,0-0.741,0.188-0.961,0.564c-0.188,0.311-0.281,0.69-0.281,1.138
+				c0,0.435,0.094,0.808,0.281,1.119c0.227,0.376,0.543,0.564,0.951,0.564c0.4,0,0.714-0.191,0.94-0.574
+				C53.725,11.882,53.822,11.506,53.822,11.071z"/>
+			<path fill="#FFFFFF" d="M62.765,8.719l-1.475,4.714h-0.96l-0.611-2.047c-0.155-0.511-0.281-1.019-0.379-1.523h-0.019
+				c-0.091,0.518-0.217,1.025-0.379,1.523l-0.649,2.047h-0.971l-1.387-4.714h1.077l0.533,2.241c0.129,0.53,0.235,1.035,0.32,1.513
+				h0.019c0.078-0.394,0.207-0.896,0.389-1.503l0.669-2.25h0.854l0.641,2.202c0.155,0.537,0.281,1.054,0.378,1.552h0.029
+				c0.071-0.485,0.178-1.002,0.32-1.552l0.572-2.202H62.765z"/>
+			<path fill="#FFFFFF" d="M68.198,13.433H67.15v-2.7c0-0.832-0.316-1.248-0.95-1.248c-0.311,0-0.562,0.114-0.757,0.343
+				c-0.193,0.229-0.291,0.499-0.291,0.808v2.796h-1.048v-3.366c0-0.414-0.013-0.863-0.038-1.349h0.921l0.049,0.737h0.029
+				c0.122-0.229,0.304-0.418,0.543-0.569c0.284-0.176,0.602-0.265,0.95-0.265c0.44,0,0.806,0.142,1.097,0.427
+				c0.362,0.349,0.543,0.87,0.543,1.562V13.433z"/>
+			<path fill="#FFFFFF" d="M71.088,13.433h-1.047V6.556h1.047V13.433z"/>
+			<path fill="#FFFFFF" d="M77.258,11.037c0,0.725-0.207,1.319-0.621,1.785c-0.434,0.479-1.01,0.718-1.727,0.718
+				c-0.693,0-1.244-0.229-1.654-0.689c-0.41-0.459-0.615-1.038-0.615-1.736c0-0.73,0.211-1.329,0.635-1.794s0.994-0.698,1.711-0.698
+				c0.693,0,1.248,0.229,1.67,0.688C77.057,9.757,77.258,10.333,77.258,11.037z M76.17,11.071c0-0.435-0.094-0.808-0.281-1.119
+				c-0.219-0.376-0.533-0.564-0.939-0.564c-0.422,0-0.742,0.188-0.961,0.564c-0.188,0.311-0.281,0.69-0.281,1.138
+				c0,0.435,0.094,0.808,0.281,1.119c0.227,0.376,0.543,0.564,0.951,0.564c0.4,0,0.713-0.191,0.939-0.574
+				C76.074,11.882,76.17,11.506,76.17,11.071z"/>
+			<path fill="#FFFFFF" d="M82.33,13.433h-0.941l-0.078-0.543h-0.029c-0.322,0.433-0.781,0.65-1.377,0.65
+				c-0.445,0-0.805-0.143-1.076-0.427c-0.246-0.258-0.369-0.579-0.369-0.96c0-0.576,0.24-1.015,0.723-1.319
+				c0.482-0.304,1.16-0.453,2.033-0.446V10.3c0-0.621-0.326-0.931-0.979-0.931c-0.465,0-0.875,0.117-1.229,0.349l-0.213-0.688
+				c0.438-0.271,0.979-0.407,1.617-0.407c1.232,0,1.85,0.65,1.85,1.95v1.736C82.262,12.78,82.285,13.155,82.33,13.433z
+				 M81.242,11.813v-0.727c-1.156-0.02-1.734,0.297-1.734,0.95c0,0.246,0.066,0.43,0.201,0.553c0.135,0.123,0.307,0.184,0.512,0.184
+				c0.23,0,0.445-0.073,0.641-0.218c0.197-0.146,0.318-0.331,0.363-0.558C81.236,11.946,81.242,11.884,81.242,11.813z"/>
+			<path fill="#FFFFFF" d="M88.285,13.433h-0.93l-0.049-0.757h-0.029c-0.297,0.576-0.803,0.864-1.514,0.864
+				c-0.568,0-1.041-0.223-1.416-0.669s-0.562-1.025-0.562-1.736c0-0.763,0.203-1.381,0.611-1.853c0.395-0.44,0.879-0.66,1.455-0.66
+				c0.633,0,1.076,0.213,1.328,0.64h0.02V6.556h1.049v5.607C88.248,12.622,88.26,13.045,88.285,13.433z M87.199,11.445v-0.786
+				c0-0.136-0.01-0.246-0.029-0.33c-0.059-0.252-0.186-0.464-0.379-0.635c-0.195-0.171-0.43-0.257-0.701-0.257
+				c-0.391,0-0.697,0.155-0.922,0.466c-0.223,0.311-0.336,0.708-0.336,1.193c0,0.466,0.107,0.844,0.322,1.135
+				c0.227,0.31,0.533,0.465,0.916,0.465c0.344,0,0.619-0.129,0.828-0.388C87.1,12.069,87.199,11.781,87.199,11.445z"/>
+			<path fill="#FFFFFF" d="M97.248,11.037c0,0.725-0.207,1.319-0.621,1.785c-0.434,0.479-1.008,0.718-1.727,0.718
+				c-0.691,0-1.242-0.229-1.654-0.689c-0.41-0.459-0.615-1.038-0.615-1.736c0-0.73,0.211-1.329,0.635-1.794s0.994-0.698,1.713-0.698
+				c0.691,0,1.248,0.229,1.668,0.688C97.047,9.757,97.248,10.333,97.248,11.037z M96.162,11.071c0-0.435-0.094-0.808-0.281-1.119
+				c-0.221-0.376-0.533-0.564-0.941-0.564c-0.42,0-0.74,0.188-0.961,0.564c-0.188,0.311-0.281,0.69-0.281,1.138
+				c0,0.435,0.094,0.808,0.281,1.119c0.227,0.376,0.543,0.564,0.951,0.564c0.4,0,0.715-0.191,0.941-0.574
+				C96.064,11.882,96.162,11.506,96.162,11.071z"/>
+			<path fill="#FFFFFF" d="M102.883,13.433h-1.047v-2.7c0-0.832-0.316-1.248-0.951-1.248c-0.311,0-0.562,0.114-0.756,0.343
+				s-0.291,0.499-0.291,0.808v2.796h-1.049v-3.366c0-0.414-0.012-0.863-0.037-1.349h0.92l0.049,0.737h0.029
+				c0.123-0.229,0.305-0.418,0.543-0.569c0.285-0.176,0.602-0.265,0.951-0.265c0.439,0,0.805,0.142,1.096,0.427
+				c0.363,0.349,0.543,0.87,0.543,1.562V13.433z"/>
+			<path fill="#FFFFFF" d="M109.936,9.504h-1.154v2.29c0,0.582,0.205,0.873,0.611,0.873c0.188,0,0.344-0.016,0.467-0.049
+				l0.027,0.795c-0.207,0.078-0.479,0.117-0.814,0.117c-0.414,0-0.736-0.126-0.969-0.378c-0.234-0.252-0.35-0.676-0.35-1.271V9.504
+				h-0.689V8.719h0.689V7.855l1.027-0.31v1.173h1.154V9.504z"/>
+			<path fill="#FFFFFF" d="M115.484,13.433h-1.049v-2.68c0-0.845-0.316-1.268-0.949-1.268c-0.486,0-0.818,0.245-1,0.735
+				c-0.031,0.103-0.049,0.229-0.049,0.377v2.835h-1.047V6.556h1.047v2.841h0.02c0.33-0.517,0.803-0.775,1.416-0.775
+				c0.434,0,0.793,0.142,1.078,0.427c0.355,0.355,0.533,0.883,0.533,1.581V13.433z"/>
+			<path fill="#FFFFFF" d="M121.207,10.853c0,0.188-0.014,0.346-0.039,0.475h-3.143c0.014,0.466,0.164,0.821,0.455,1.067
+				c0.266,0.22,0.609,0.33,1.029,0.33c0.465,0,0.889-0.074,1.271-0.223l0.164,0.728c-0.447,0.194-0.973,0.291-1.582,0.291
+				c-0.73,0-1.305-0.215-1.721-0.645c-0.418-0.43-0.625-1.007-0.625-1.731c0-0.711,0.193-1.303,0.582-1.775
+				c0.406-0.504,0.955-0.756,1.648-0.756c0.678,0,1.193,0.252,1.541,0.756C121.068,9.77,121.207,10.265,121.207,10.853z
+				 M120.207,10.582c0.008-0.311-0.061-0.579-0.203-0.805c-0.182-0.291-0.459-0.437-0.834-0.437c-0.342,0-0.621,0.142-0.834,0.427
+				c-0.174,0.227-0.277,0.498-0.311,0.815H120.207z"/>
+		</g>
+	</g>
+</g>
+</svg>

From 7f04982da0759b3a57f0790a5cc2b3600251f4db Mon Sep 17 00:00:00 2001
From: Yishi Lin <yishilin14@gmail.com>
Date: Sat, 28 Oct 2017 20:39:02 +0800
Subject: [PATCH 41/42] Remove the cancel button of the extension search bar

---
 .../Base.lproj/MainInterface.storyboard          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/passExtension/Base.lproj/MainInterface.storyboard b/passExtension/Base.lproj/MainInterface.storyboard
index 974a830..4755832 100644
--- a/passExtension/Base.lproj/MainInterface.storyboard
+++ b/passExtension/Base.lproj/MainInterface.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="QHc-XA-1MZ">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="QHc-XA-1MZ">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13174"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -13,7 +13,7 @@
         <!--Password Store-->
         <scene sceneID="NlT-0d-7x9">
             <objects>
-                <viewController id="DnC-Ka-AYb" customClass="ExtensionViewController" customModule="passextension" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="DnC-Ka-AYb" customClass="ExtensionViewController" customModule="passExtension" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="TbF-II-itz"/>
                         <viewControllerLayoutGuide type="bottom" id="9b9-wt-KCV"/>
@@ -25,7 +25,7 @@
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="P9f-HJ-cS5">
                                 <rect key="frame" x="0.0" y="64" width="375" height="626"/>
                                 <subviews>
-                                    <searchBar contentMode="redraw" showsCancelButton="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xuO-jY-YRU">
+                                    <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="xuO-jY-YRU">
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                         <textInputTraits key="textInputTraits"/>
                                     </searchBar>
@@ -37,18 +37,18 @@
                                                 <rect key="frame" x="0.0" y="28" width="375" height="44"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="T2b-vj-fza" id="aVb-V4-hqg">
-                                                    <rect key="frame" x="0.0" y="0.0" width="342" height="44"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="342" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="LUo-8T-I4j">
-                                                            <rect key="frame" x="15" y="12" width="33" height="21"/>
+                                                            <rect key="frame" x="15" y="12" width="33.5" height="20.5"/>
                                                             <autoresizingMask key="autoresizingMask"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                             <nil key="textColor"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9ik-sy-sTS">
-                                                            <rect key="frame" x="296" y="12" width="44" height="21"/>
+                                                            <rect key="frame" x="296" y="12" width="44" height="20.5"/>
                                                             <autoresizingMask key="autoresizingMask"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                             <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
@@ -101,7 +101,7 @@
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="QHc-XA-1MZ" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="WRo-Vb-Kcg">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <nil name="viewControllers"/>

From 9580ea23a19083bb315d29d0575d6aafafd02377 Mon Sep 17 00:00:00 2001
From: Bob Sun <bob@mssun.me>
Date: Fri, 10 Nov 2017 19:43:33 -0800
Subject: [PATCH 42/42] Version bump

---
 pass/Info.plist          | 2 +-
 passExtension/Info.plist | 2 +-
 passKit/Info.plist       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pass/Info.plist b/pass/Info.plist
index a64e4c0..dd7b02f 100644
--- a/pass/Info.plist
+++ b/pass/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.10</string>
+	<string>0.3.0</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
diff --git a/passExtension/Info.plist b/passExtension/Info.plist
index 4648406..5e96e11 100644
--- a/passExtension/Info.plist
+++ b/passExtension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.10</string>
+	<string>0.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>
diff --git a/passKit/Info.plist b/passKit/Info.plist
index b7bfbec..caf06e5 100644
--- a/passKit/Info.plist
+++ b/passKit/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>