From 396f6fa7bdd854ffbdf87e574ed3ee9f7db281c7 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Mon, 4 Nov 2013 08:22:21 -0500
Subject: [PATCH] Navbar overlap in all-sites VC.

[FIXED]     Navbar hack in all-sites causing overlap on device in iOS 7.
[UPDATED]   iCloud defaults to off.
---
 External/LoveLyndir                           |  2 +-
 .../ObjC/iOS/MPElementListAllViewController.h |  2 -
 .../ObjC/iOS/MPElementListAllViewController.m |  8 +-
 .../ObjC/iOS/MPMainViewController.m           |  4 +-
 .../ObjC/iOS/MainStoryboard_iPhone.storyboard | 79 +++++++++----------
 .../project.pbxproj                           |  6 ++
 .../ObjC/iOS/Settings.bundle/Root.plist       |  2 +-
 7 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/External/LoveLyndir b/External/LoveLyndir
index e2edbb3d..5ec3681a 160000
--- a/External/LoveLyndir
+++ b/External/LoveLyndir
@@ -1 +1 @@
-Subproject commit e2edbb3d7757b8f25cefe763d32ce86ff3f1ebae
+Subproject commit 5ec3681a3ca80a520d4255fe07bdb2b0b3d94d22
diff --git a/MasterPassword/ObjC/iOS/MPElementListAllViewController.h b/MasterPassword/ObjC/iOS/MPElementListAllViewController.h
index b848aee1..984cf97b 100644
--- a/MasterPassword/ObjC/iOS/MPElementListAllViewController.h
+++ b/MasterPassword/ObjC/iOS/MPElementListAllViewController.h
@@ -21,8 +21,6 @@
 
 @interface MPElementListAllViewController : MPElementListController
 
-@property(weak, nonatomic) IBOutlet UINavigationBar *navigationBar;
-
 - (IBAction)close:(id)sender;
 - (IBAction)add:(id)sender;
 
diff --git a/MasterPassword/ObjC/iOS/MPElementListAllViewController.m b/MasterPassword/ObjC/iOS/MPElementListAllViewController.m
index fe3dedef..381f732f 100644
--- a/MasterPassword/ObjC/iOS/MPElementListAllViewController.m
+++ b/MasterPassword/ObjC/iOS/MPElementListAllViewController.m
@@ -39,13 +39,13 @@
     [super viewWillAppear:animated];
 
     if ([self.filter isEqualToString:MPElementListFilterNone]) {
-        self.navigationBar.topItem.title = @"All Sites";
-        self.navigationBar.topItem.rightBarButtonItem = [[UIBarButtonItem alloc]
+        self.navigationItem.title = @"All Sites";
+        self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc]
                 initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(add:)];
     }
     else if ([self.filter isEqualToString:MPElementListFilterOutdated]) {
-        self.navigationBar.topItem.title = @"Outdated";
-        self.navigationBar.topItem.rightBarButtonItem = [[UIBarButtonItem alloc]
+        self.navigationItem.title = @"Outdated";
+        self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc]
                 initWithTitle:@"Upgrade All" style:UIBarButtonItemStyleBordered target:self action:@selector(upgradeAll:)];
     }
 
diff --git a/MasterPassword/ObjC/iOS/MPMainViewController.m b/MasterPassword/ObjC/iOS/MPMainViewController.m
index 82370ba1..88dfeed9 100644
--- a/MasterPassword/ObjC/iOS/MPMainViewController.m
+++ b/MasterPassword/ObjC/iOS/MPMainViewController.m
@@ -48,8 +48,8 @@
     if ([[segue identifier] isEqualToString:@"MP_ChooseType"])
         ((MPTypeViewController *)[segue destinationViewController]).delegate = self;
     if ([[segue identifier] isEqualToString:@"MP_AllSites"]) {
-        ((MPElementListAllViewController *)[segue destinationViewController]).delegate = self;
-        ((MPElementListAllViewController *)[segue destinationViewController]).filter = sender;
+        ((MPElementListAllViewController *)[[segue destinationViewController] topViewController]).delegate = self;
+        ((MPElementListAllViewController *)[[segue destinationViewController] topViewController]).filter = sender;
     }
 }
 
diff --git a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard
index a12aec8e..a647b2b6 100644
--- a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard
+++ b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="KZF-fe-y9n">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="KZF-fe-y9n">
     <dependencies>
         <deployment defaultVersion="1536" identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
@@ -491,7 +491,7 @@ Your passwords will be AES-encrypted with your master password.</string>
 119-20:51:59     MPAppDelegate_Store.m:278 | DEBUG   : [StoreManager] Will load cloud store: 0B3CA2DF-5796-44DF-B5E0-121EC3846464 (definite).
 119-20:51:59             PearlConfig.m:193 | INFO    : Lock screen will appear
 119-20:51:59        MPiOSAppDelegate.m:412 | INFO    : Re-activated
-119-20:51:59             PearlConfig.m:180 | DEBUG   : MPiOSConfig.launchCount = [70 ->] 71
+119-20:51:59             PearlConfig.m:180 | DEBUG   : MPiOSConfig.launchCount = [70 -&gt;] 71
 119-20:52:02     MPAppDelegate_Store.m:278 | DEBUG   : [StoreManager] Clearing stores...
 119-20:52:03     MPAppDelegate_Store.m:278 | DEBUG   : [StoreManager] Loading store without seeding.
 119-20:52:09     MPAppDelegate_Store.m:278 | DEBUG   : [StoreManager] Cloud enabled and successfully loaded cloud store.
@@ -1099,7 +1099,7 @@ L4m3P4sSw0rD</string>
                         <outlet property="typeTipContainer" destination="g55-0m-WjS" id="KZ9-KV-NMh"/>
                         <segue destination="oLN-6u-GLb" kind="push" identifier="MP_UserProfile" id="tKN-Sw-S5J"/>
                         <segue destination="2Th-Tb-22a" kind="modal" identifier="MP_OtherApps" id="Io5-cz-v9Y"/>
-                        <segue destination="idA-Pj-1U9" kind="modal" identifier="MP_AllSites" id="nVS-UW-cgK"/>
+                        <segue destination="qfo-Zn-t3f" kind="modal" identifier="MP_AllSites" id="KqI-r4-Bi4"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="mK2-p1-3zC" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1860,7 +1860,7 @@ If you set a custom password, it will be encrypted before it is saved to the clo
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
-                            <switch opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" id="M0m-G9-hH0">
+                            <switch opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="M0m-G9-hH0">
                                 <rect key="frame" x="136" y="345" width="51" height="31"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <color key="onTintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
@@ -1883,56 +1883,51 @@ If you set a custom password, it will be encrypted before it is saved to the clo
             </objects>
             <point key="canvasLocation" x="996" y="1425"/>
         </scene>
-        <!--Element List All View Controller-->
+        <!--Element List All View Controller - All Sites-->
         <scene sceneID="I7c-vt-d2s">
             <objects>
                 <tableViewController id="idA-Pj-1U9" customClass="MPElementListAllViewController" sceneMemberID="viewController">
                     <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="48" sectionHeaderHeight="22" sectionFooterHeight="22" id="N83-sj-4tl">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="64" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <view key="tableHeaderView" contentMode="scaleToFill" id="8py-Tx-ShT">
-                            <rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <subviews>
-                                <navigationBar contentMode="scaleToFill" barStyle="black" translucent="NO" id="l0p-Tu-L9k">
-                                    <rect key="frame" x="0.0" y="20" width="320" height="44"/>
-                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                    <inset key="insetFor6xAndEarlier" minX="0.0" minY="20" maxX="0.0" maxY="-20"/>
-                                    <color key="tintColor" red="0.47450980390000003" green="0.86666666670000003" blue="0.98431372549999996" alpha="1" colorSpace="calibratedRGB"/>
-                                    <color key="barTintColor" red="0.12549020350000001" green="0.1411764771" blue="0.14901961389999999" alpha="1" colorSpace="calibratedRGB"/>
-                                    <textAttributes key="titleTextAttributes">
-                                        <color key="textColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
-                                    </textAttributes>
-                                    <items>
-                                        <navigationItem title="All Sites" id="Ipv-Tt-WPc">
-                                            <barButtonItem key="leftBarButtonItem" title="Close" style="done" id="Mnn-6X-DgP">
-                                                <connections>
-                                                    <action selector="close:" destination="idA-Pj-1U9" id="qqC-U7-8Ci"/>
-                                                </connections>
-                                            </barButtonItem>
-                                            <barButtonItem key="rightBarButtonItem" systemItem="add" id="CR8-WY-9Td">
-                                                <connections>
-                                                    <action selector="add:" destination="idA-Pj-1U9" id="G7b-hR-IH0"/>
-                                                </connections>
-                                            </barButtonItem>
-                                        </navigationItem>
-                                    </items>
-                                </navigationBar>
-                            </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                        </view>
+                        <sections/>
                         <connections>
                             <outlet property="dataSource" destination="idA-Pj-1U9" id="yPh-6k-Ba9"/>
                             <outlet property="delegate" destination="idA-Pj-1U9" id="bdk-Iu-Hpv"/>
                         </connections>
                     </tableView>
                     <extendedEdge key="edgesForExtendedLayout"/>
-                    <connections>
-                        <outlet property="navigationBar" destination="l0p-Tu-L9k" id="9DR-L3-ggI"/>
-                    </connections>
+                    <navigationItem key="navigationItem" title="All Sites" id="Ipv-Tt-WPc">
+                        <barButtonItem key="leftBarButtonItem" title="Close" style="done" id="Mnn-6X-DgP">
+                            <connections>
+                                <action selector="close:" destination="idA-Pj-1U9" id="qqC-U7-8Ci"/>
+                            </connections>
+                        </barButtonItem>
+                        <barButtonItem key="rightBarButtonItem" systemItem="add" id="CR8-WY-9Td">
+                            <connections>
+                                <action selector="add:" destination="idA-Pj-1U9" id="G7b-hR-IH0"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="abw-PC-pyQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="2078" y="-495"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="ccP-3N-RcH">
+            <objects>
+                <navigationController definesPresentationContext="YES" id="qfo-Zn-t3f" sceneMemberID="viewController">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" barStyle="black" translucent="NO" id="VD5-bs-rqR">
+                        <autoresizingMask key="autoresizingMask"/>
+                        <color key="barTintColor" red="0.12549020350000001" green="0.1411764771" blue="0.14901961389999999" alpha="1" colorSpace="calibratedRGB"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="idA-Pj-1U9" kind="relationship" relationship="rootViewController" id="TaP-C4-g26"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="wdr-am-yY7" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
             <point key="canvasLocation" x="1537" y="-495"/>
         </scene>
         <!--Apps View Controller-->
@@ -1991,7 +1986,7 @@ If you set a custom password, it will be encrypted before it is saved to the clo
                     <extendedEdge key="edgesForExtendedLayout"/>
                     <toolbarItems/>
                     <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="lightContent"/>
-                    <navigationBar key="navigationBar" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" barStyle="black" translucent="NO" id="sif-x3-Fol">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" barStyle="black" translucent="NO" id="sif-x3-Fol">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" red="0.47450980390000003" green="0.86666666670000003" blue="0.98431372549999996" alpha="1" colorSpace="calibratedRGB"/>
@@ -2200,7 +2195,7 @@ If you set a custom password, it will be encrypted before it is saved to the clo
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" lineBreakMode="tailTruncation" numberOfLines="0" minimumFontSize="10" id="qoQ-x9-XHs">
                                                     <rect key="frame" x="20" y="0.0" width="280" height="155"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                    <string key="text">"Save Password" will store your master password in the keychain.  This means you won't need the master password anymore to log in (unless your device gets restored or you start using a new device). This is somewhat less secure in the event of theft.  You can compensate for the reduced security by going into Settings and navigating: General->Passcode Lock, disabling "Simple Passcode", and setting a more secure passcode for your device.</string>
+                                                    <string key="text">"Save Password" will store your master password in the keychain.  This means you won't need the master password anymore to log in (unless your device gets restored or you start using a new device). This is somewhat less secure in the event of theft.  You can compensate for the reduced security by going into Settings and navigating: General-&gt;Passcode Lock, disabling "Simple Passcode", and setting a more secure passcode for your device.</string>
                                                     <fontDescription key="fontDescription" name="GillSans-LightItalic" family="Gill Sans" pointSize="14"/>
                                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
index 3b2ec1a7..d10e49ac 100644
--- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -21,6 +21,7 @@
 		93D399BBC0A7EC746CB1B19B /* MPLogsViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D391943675426839501BB8 /* MPLogsViewController.h */; };
 		93D39C34FE35830EF5BE1D2A /* NSArray+Indexing.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D396D04E57792A54D437AC /* NSArray+Indexing.h */; };
 		93D39C8AD8EAB747856B3A8C /* LLModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3923B42DA2DA18F287092 /* LLModel.m */; };
+		93D39CFC8520AD406FFF72D7 /* LLAboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39696C9572BEE830F2EAB /* LLAboutViewController.m */; };
 		93D39E281E3658B30550CB55 /* NSDictionary+Indexing.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39AA1EE2E1E7B81372240 /* NSDictionary+Indexing.m */; };
 		93D39EC9C559D2922B048CFE /* NSURL+UbiquityStoreManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D3957F61D8AFE3B6580C32 /* NSURL+UbiquityStoreManager.h */; };
 		93D39F8A9254177891F38705 /* MPSetupViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39A28369954D147E239BA /* MPSetupViewController.m */; };
@@ -421,6 +422,8 @@
 		93D3942A356B639724157982 /* PearlOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlOverlay.h; sourceTree = "<group>"; };
 		93D3956915634581E737B38C /* PearlNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlNavigationController.m; sourceTree = "<group>"; };
 		93D3957F61D8AFE3B6580C32 /* NSURL+UbiquityStoreManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURL+UbiquityStoreManager.h"; sourceTree = "<group>"; };
+		93D395B53B7175D22034BBEF /* LLAboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LLAboutViewController.h; sourceTree = "<group>"; };
+		93D39696C9572BEE830F2EAB /* LLAboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LLAboutViewController.m; sourceTree = "<group>"; };
 		93D396D04E57792A54D437AC /* NSArray+Indexing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+Indexing.h"; sourceTree = "<group>"; };
 		93D3970B24FC0B53D989F7E3 /* NSURL+UbiquityStoreManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+UbiquityStoreManager.m"; sourceTree = "<group>"; };
 		93D39730673227EFF6DEFF19 /* MPSetupViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSetupViewController.h; sourceTree = "<group>"; };
@@ -2530,6 +2533,8 @@
 				93D3983278751A530262F64E /* LLConfig.h */,
 				93D39BF6BCBDFFE844E7D34C /* LLButtonView.m */,
 				93D39BA6C5CB452973918B7D /* LLButtonView.h */,
+				93D39696C9572BEE830F2EAB /* LLAboutViewController.m */,
+				93D395B53B7175D22034BBEF /* LLAboutViewController.h */,
 			);
 			path = ObjC;
 			sourceTree = "<group>";
@@ -3559,6 +3564,7 @@
 				DADEF4471810D5850052CA3E /* LLToggleViewController.m in Sources */,
 				93D39C8AD8EAB747856B3A8C /* LLModel.m in Sources */,
 				93D39233C3EDD9A947ABA52D /* LLButtonView.m in Sources */,
+				93D39CFC8520AD406FFF72D7 /* LLAboutViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/MasterPassword/ObjC/iOS/Settings.bundle/Root.plist b/MasterPassword/ObjC/iOS/Settings.bundle/Root.plist
index 01ca9a9a..e3ffcd59 100644
--- a/MasterPassword/ObjC/iOS/Settings.bundle/Root.plist
+++ b/MasterPassword/ObjC/iOS/Settings.bundle/Root.plist
@@ -86,7 +86,7 @@
 			<key>Key</key>
 			<string>iCloudEnabled</string>
 			<key>DefaultValue</key>
-			<true/>
+			<false/>
 		</dict>
 	</array>
 	<key>StringsTable</key>