From bbd0062301fc7636866ae8cd4b50cb1df604f0ae Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Sat, 17 Aug 2013 01:45:18 +0200
Subject: [PATCH] Minor GUI changes Updated KeePassKit submodule Added test
 stub for autotype parsing

---
 KeePassKit                                |   2 +-
 MacPass.xcodeproj/project.pbxproj         |   4 +++
 MacPass/Base.lproj/InspectorView.xib      |  42 ++++++----------------
 MacPassTests/Databases/Autotype_test.kdbx | Bin 0 -> 1470 bytes
 MacPassTests/KPKXmlLoadingTest.m          |  11 ++++++
 5 files changed, 27 insertions(+), 32 deletions(-)
 create mode 100644 MacPassTests/Databases/Autotype_test.kdbx

diff --git a/KeePassKit b/KeePassKit
index bededcbf..85cd05a9 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit bededcbfb8758374a710ca67cbb059ad066f42e6
+Subproject commit 85cd05a9ed5860c41be9f825abc284a0ec8af02c
diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 49dd8191..a4c1cca2 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -118,6 +118,7 @@
 		4C52A88F1788628B00868229 /* 13_KeysTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C52A88C1788628B00868229 /* 13_KeysTemplate.pdf */; };
 		4C52A8901788628B00868229 /* 18_DisplayTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C52A88D1788628B00868229 /* 18_DisplayTemplate.pdf */; };
 		4C52A892178863B000868229 /* 68_PhoneTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C52A891178863B000868229 /* 68_PhoneTemplate.pdf */; };
+		4C5426F317BEEA8700A4424C /* Autotype_test.kdbx in Resources */ = {isa = PBXBuildFile; fileRef = 4C5426F217BEEA8700A4424C /* Autotype_test.kdbx */; };
 		4C569D9E17652B0600595B62 /* MPConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C569D9D17652B0600595B62 /* MPConstants.m */; };
 		4C569DA117652BFE00595B62 /* MPEntryTableDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C569DA017652BFE00595B62 /* MPEntryTableDataSource.m */; };
 		4C569DA417653F3500595B62 /* KdbEntry+MPTreeTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C569DA317653F3500595B62 /* KdbEntry+MPTreeTools.m */; };
@@ -511,6 +512,7 @@
 		4C52A88C1788628B00868229 /* 13_KeysTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 13_KeysTemplate.pdf; sourceTree = "<group>"; };
 		4C52A88D1788628B00868229 /* 18_DisplayTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 18_DisplayTemplate.pdf; sourceTree = "<group>"; };
 		4C52A891178863B000868229 /* 68_PhoneTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 68_PhoneTemplate.pdf; sourceTree = "<group>"; };
+		4C5426F217BEEA8700A4424C /* Autotype_test.kdbx */ = {isa = PBXFileReference; lastKnownFileType = file; name = Autotype_test.kdbx; path = Databases/Autotype_test.kdbx; sourceTree = "<group>"; };
 		4C569D9C17652AC800595B62 /* MPConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPConstants.h; sourceTree = "<group>"; };
 		4C569D9D17652B0600595B62 /* MPConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPConstants.m; sourceTree = "<group>"; };
 		4C569D9F17652BFE00595B62 /* MPEntryTableDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEntryTableDataSource.h; sourceTree = "<group>"; };
@@ -946,6 +948,7 @@
 		4C18F9AC178E123200890BCE /* Databases */ = {
 			isa = PBXGroup;
 			children = (
+				4C5426F217BEEA8700A4424C /* Autotype_test.kdbx */,
 				4C6366B017AFB52500AAF17D /* CustomIcon_Password_1234.kdbx */,
 				4C6366B117AFB52500AAF17D /* CustomIcon_Password_1234.xml */,
 				4C6366B217AFB52500AAF17D /* KDB1_KeePassX_test.kdb */,
@@ -1934,6 +1937,7 @@
 				4C6366B417AFB52500AAF17D /* CustomIcon_Password_1234.xml in Resources */,
 				4C6366B517AFB52500AAF17D /* KDB1_KeePassX_test.kdb in Resources */,
 				4CEAF85717BA9B1D001307A6 /* Keepass2Key.xml in Resources */,
+				4C5426F317BEEA8700A4424C /* Autotype_test.kdbx in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/MacPass/Base.lproj/InspectorView.xib b/MacPass/Base.lproj/InspectorView.xib
index 20415c0b..fd83de5d 100644
--- a/MacPass/Base.lproj/InspectorView.xib
+++ b/MacPass/Base.lproj/InspectorView.xib
@@ -107,7 +107,7 @@
 						<object class="NSImageCell" key="NSCell" id="152819686">
 							<int key="NSCellFlags">134217728</int>
 							<int key="NSCellFlags2">33554432</int>
-							<object class="NSCustomResource" key="NSContents" id="1066877891">
+							<object class="NSCustomResource" key="NSContents">
 								<string key="NSClassName">NSImage</string>
 								<string key="NSResourceName">NSActionTemplate</string>
 							</object>
@@ -127,7 +127,7 @@
 							<object class="NSButton" id="830540359">
 								<reference key="NSNextResponder" ref="381395509"/>
 								<int key="NSvFlags">268</int>
-								<string key="NSFrame">{{20, 2}, {238, 25}}</string>
+								<string key="NSFrame">{{20, 2}, {59, 25}}</string>
 								<reference key="NSSuperview" ref="381395509"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView"/>
@@ -142,7 +142,10 @@
 									<reference key="NSControlView" ref="830540359"/>
 									<int key="NSButtonFlags">918306816</int>
 									<int key="NSButtonFlags2">163</int>
-									<reference key="NSNormalImage" ref="1066877891"/>
+									<object class="NSCustomResource" key="NSNormalImage">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">07_NotepadTemplate</string>
+									</object>
 									<string key="NSAlternateContents"/>
 									<string key="NSKeyEquivalent"/>
 									<int key="NSPeriodicDelay">400</int>
@@ -598,22 +601,6 @@
 						<int key="objectID">2930</int>
 						<reference key="object" ref="381395509"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="46370971">
-								<reference key="firstItem" ref="381395509"/>
-								<int key="firstAttribute">6</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="830540359"/>
-								<int key="secondAttribute">6</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="381395509"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="696932551">
 								<reference key="firstItem" ref="830540359"/>
 								<int key="firstAttribute">10</int>
@@ -883,11 +870,6 @@
 						<reference key="object" ref="696932551"/>
 						<reference key="parent" ref="381395509"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3115</int>
-						<reference key="object" ref="46370971"/>
-						<reference key="parent" ref="381395509"/>
-					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -925,11 +907,10 @@
 				<string key="2899.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2925.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2929.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="2930.IBNSViewMetadataConstraints">
+				<array class="NSMutableArray" key="2930.IBNSViewMetadataConstraints">
 					<reference ref="574545128"/>
 					<reference ref="618180937"/>
 					<reference ref="696932551"/>
-					<reference ref="46370971"/>
 				</array>
 				<boolean value="NO" key="2930.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="2930.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -973,7 +954,6 @@
 				<string key="3110.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3111.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3112.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="3115.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
@@ -1079,10 +1059,10 @@
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NS.key.0">NSActionTemplate</string>
-			<string key="NS.object.0">{15, 15}</string>
-		</object>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="07_NotepadTemplate">{128, 128}</string>
+			<string key="NSActionTemplate">{15, 15}</string>
+		</dictionary>
 		<bool key="IBDocument.UseAutolayout">YES</bool>
 	</data>
 </archive>
diff --git a/MacPassTests/Databases/Autotype_test.kdbx b/MacPassTests/Databases/Autotype_test.kdbx
new file mode 100644
index 0000000000000000000000000000000000000000..601124d420175bfb5d0128f224679cf7c82e2986
GIT binary patch
literal 1470
zcmV;v1wr})*`k_f`%AR}00RI55CAd3^5(yBLr}h01tDtuTK@wC0096100bZai+kH-
zZB6hUnLV%?;)#Esr<Oa`4)eRfP12xOo8u`$1t0+V)H$rE5N5Zs4-6R%ZH{BWF>Eog
z`k0E!6Nc3i2n&Y>2mnyS00000000LN08cEZqZG5rEQ?M>D$J6CXb2zx#XrKWw9T$U
zYT`(=<8ET6Y+;E5rb5MMT^l<(@oFD*2_OK{ZFzGolV7>;1dY`5)4X3%CCTjeavEB}
zAvWL#J%;HD1ONg60000401XNa3bxXfo?j4ymFM`UK~HV1K)szUEOA=smg6;@P1CvA
z_nl{__Ikb1v<a8W6gYUGZenp{)Xq#X1eZ-EP>TF;&1+Q{b&2Ts9gyFw3lp<ulnF9|
zUZyJ>7}1?-L(j_O+0U*1NQ2<B@>SO3brXh?Hj^Ie;y1xU>{yk$h$vt}&x_#OW&85+
z?!j0NO`Z}S*9Ci3Jw`PL-m}&9zi#q+j6(=86hOlv8_2y`V=8(%g+bFW-TL^hA=@l*
zf>7AR!SIZ=Ag7IVutkjl^cqN9;@J`wrupb1*Ha4P<YV$$Ji8BWGbj%177r${Y5&J0
zN#^@X&2N}E@rx*B3ss{#IktH;`O~kd@}Pdik%e<0NnyrIy|kH}{)tI$WPV+hwX{GB
zNp3MzSstT>I@zCZp<UVe-W*QNHuJm^(q*ltT!vja95iCis*H^$5?6jofhzgoxmwG2
zzm$$QpOme>-RAi_LcwHVPCE}+H(5j>f<%BLNM5z!o3njA_o0NrgdgrY*S1!2o<~^#
zR79#GIEZ&^+COjxVYL<rc@7HQ{!cmVe*XLq;}JazlIuSc@MT6)4sZa_!N|Zraa!A%
zgTOR?eS`aq)|6gtodD8LxC68+chi-hHnXXjE_J$dH80cF`uCu`*Y=7guT|!J)MT&n
zgfZ*%=5w*5LjD~&T9_C(VV2o8#qi|JYU|p0t{3ggx(V``@tRnG-Jm5xN+8xiF<3<x
zDm38EA+u|t!H?!dwS~A+q9(2>_@nMvvu)99uDE{`1?^+oGWJD97hmls|G<Q2a0&Yb
zGoh59=>V&K?khg4cF{)@li+@=#_ng~lQ}_V8-&GL*$VUNmB-%zaB>Wd-3K1(0h9!`
z<Iv5X6vp@hi-in#(Q||i+easRaC%NxKeC-j4nMMQpJPSzDY&{u?i)n9R>_)y2i2Xd
znSgpH9;=X`sd^gA57fR|XV36mT<1suvx`AYJ}TbsTt235V5(!8<`8x_tc}b?_V349
zkK?2yv-UTo@p|+hbJXdYc0?2hZ_<zm*FgosF7Z3kvgm$vNBH^MeRu9+tW<{)lU)3m
z4GW%5;1*z)>^kisXv4aYo%N0U%f*D)VOeF$2KlemeavdaeB(sOqeJ=PC?UZnzcro+
z43Xb|hRAyrRhk9IPUQERFJzqtTetsuf6M{#aAV}4#Bgm0ce4?SNHxM1XBcXCKy33A
zL2E#=knj;t0d+WWw0G?tLE!iN(!{y6dg|6wRE0$3usp_Hxwwrwfvv5is;uVT_Xet$
z84s<t_tohqw{dVtKCTHkRilWLL)7)`QZ}X&fPCIro{C2L?;N#IGdd1e91WS1(y)d#
z<349;IIX}7_yW&=ibdiWF=17Bp6O@BlpoYVfYPAVPM3e=%lPFWQ*~j~sFEWl4EbeG
zR2hcIWP@?vdN|4lb@lXRyjEhpQ3sMcLuG^h*0jRCCWjDrA-DNyZ)!lA%pAo!gZWt)
z7Qcf5&-yzgO03X(gb?RpJ~8<w;D}q%DU&})-Xy}rqt@F0h6jWSCuRmvk%d@-{T4!&
z1O(U1jq)9`1(@>c(PsnK@VgO2MY>0QUxb(D6`vwQ0i1KYc0g@F>*!cPG?9B#P=lTb
YJ4fVT$#4aEIXE>o5X?4InrNHjH}PlA8vp<R

literal 0
HcmV?d00001

diff --git a/MacPassTests/KPKXmlLoadingTest.m b/MacPassTests/KPKXmlLoadingTest.m
index bc2c28a3..e86b86bb 100644
--- a/MacPassTests/KPKXmlLoadingTest.m
+++ b/MacPassTests/KPKXmlLoadingTest.m
@@ -36,4 +36,15 @@
   STAssertTrue([tree.root.entries count] == 1, @"Tree has only one entry");
 }
 
+- (void)testAutotypeLoading {
+  NSBundle *myBundle = [NSBundle bundleForClass:[self class]];
+  NSURL *url = [myBundle URLForResource:@"Autotype_test" withExtension:@"kdbx"];
+  KPKPassword *password = [[KPKPassword alloc] initWithPassword:@"text" key:nil];
+  NSError *error;
+  KPKTree *tree = [[KPKTree alloc] initWithContentsOfUrl:url password:password error:&error];
+  STAssertNotNil(tree, @"Tree shoud be loaded");
+  KPKEntry *entry = tree.root.entries[0];
+  STAssertNotNil(entry, @"Entry should be there");
+}
+
 @end