Updated submodules

Unfinished Toolbar Button

MacPass.xcodeproj/project.pbxproj

@@ -196,7 +196,6 @@
 		4CA0B2FC15BCAF8600654E32 /* MPSettingsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2FB15BCAF8600654E32 /* MPSettingsWindowController.m */; };
 		4CA0E3A7176FAF99004D18CB /* MPDocumentQueryService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0E3A6176FAF99004D18CB /* MPDocumentQueryService.m */; };
 		4CA2335A176DBFE100F0B6AC /* MPLockDaemon.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */; };
-		4CA7C36C179A98140099C34B /* NSString+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA7C36B179A98140099C34B /* NSString+Base64.m */; };
 		4CAD747B15B887FD00104512 /* DDXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */; };
 		4CAD747C15B887FD00104512 /* NSString+DDXML.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745A15B887FD00104512 /* NSString+DDXML.m */; };
 		4CAD747D15B887FD00104512 /* DDXMLDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745D15B887FD00104512 /* DDXMLDocument.m */; };
@@ -618,8 +617,6 @@
 		4CA0E3A6176FAF99004D18CB /* MPDocumentQueryService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDocumentQueryService.m; sourceTree = "<group>"; };
 		4CA23358176DBFE100F0B6AC /* MPLockDaemon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLockDaemon.h; sourceTree = "<group>"; };
 		4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPLockDaemon.m; sourceTree = "<group>"; };
-		4CA7C36A179A98140099C34B /* NSString+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Base64.h"; sourceTree = "<group>"; };
-		4CA7C36B179A98140099C34B /* NSString+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Base64.m"; sourceTree = "<group>"; };
 		4CAAFDD51787AED60013FCF9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = "<group>"; };
 		4CAD745615B887FD00104512 /* DDXMLElementAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDXMLElementAdditions.h; sourceTree = "<group>"; };
 		4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDXMLElementAdditions.m; sourceTree = "<group>"; };
@@ -996,8 +993,6 @@
 				4C2724D917790E7C00FD8456 /* NSMutableData+Base64.m */,
 				4C801AFA179310E2002821E3 /* NSString+Hexdata.h */,
 				4C801AFB179310E2002821E3 /* NSString+Hexdata.m */,
-				4CA7C36A179A98140099C34B /* NSString+Base64.h */,
-				4CA7C36B179A98140099C34B /* NSString+Base64.m */,
 			);
 			name = Categories;
 			sourceTree = "<group>";
@@ -1963,7 +1958,6 @@
 				4C45100C1798C65C00219998 /* Kdb4Entry+MPAdditions.m in Sources */,
 				4CFEB36E1799D9CF00AF1868 /* Kdb3Entry+KVOAdditions.m in Sources */,
 				4C305F36179A0BD70082334F /* KPKIcon.m in Sources */,
-				4CA7C36C179A98140099C34B /* NSString+Base64.m in Sources */,
 				4C1842AB179B027800E2F5BC /* KPKDeletedNode.m in Sources */,
 				4C1842AF179B211C00E2F5BC /* KPKXmlTreeReader.m in Sources */,
 				4C1842B2179B28C400E2F5BC /* KPKLegacyTreeReader.m in Sources */,

MacPass/MPConstants.h

@@ -12,6 +12,8 @@
 #import <Foundation/Foundation.h>
 
 FOUNDATION_EXPORT NSString *const MPPasteBoardType;
+FOUNDATION_EXPORT NSString *const MPEntryUTI;
+FOUNDATION_EXPORT NSString *const MPGroupUTI;
 FOUNDATION_EXPORT NSString *const MPErrorDomain;
 
 #endif

MacPass/MPConstants.m

@@ -9,4 +9,6 @@
 #import "MPConstants.h"
 
 NSString *const MPPasteBoardType  = @"com.hicknhack.macpass.pasteboard";
-NSString *const MPErrorDomain     = @"com.hicknhack.macpass.error";
+NSString *const MPErrorDomain     = @"com.hicknhack.macpass.error";
+NSString *const MPEntryUTI        = @"com.hicknhack.macpass.entry";
+NSString *const MPGroupUTI        = @"com.hicknhack.macpass.group";

MacPass/MPToolbarDelegate.m

@@ -100,6 +100,7 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
       fittingRect.size.width = MAX( (CGFloat)32.0,fittingRect.size.width);
       [button setFrame:fittingRect];
       [item setView:button];
+      /* Create the Contextual Menu button */
       NSMenuItem *menuRepresentation = [[NSMenuItem alloc] initWithTitle:itemLabel
                                                                   action:[self _actionForToolbarItemIdentifier:itemIdentifier]
                                                            keyEquivalent:@""];

MacPassTests/KPKXmlLoadingTest.m

@@ -10,6 +10,10 @@
 #import "KPKTreeCryptor.h"
 #import "KPKPassword.h"
 
+#import "KPKTree.h"
+#import "KPKEntry.h"
+#import "KPKGroup.h"
+
 @implementation KPKXmlLoadingTest
 
 - (void)setUp {
@@ -28,6 +32,21 @@
   KPKTreeCryptor *cryptor = [KPKTreeCryptor treeCryptorWithData:_data password:_password];
   KPKTree *tree = [cryptor decryptTree:NULL];
   STAssertNotNil(tree, @"Loading should result in a tree object");
+
+  STAssertTrue([tree.root.groups count] == 0, @"Tree contains just root group");
+  STAssertTrue([tree.root.entries count] == 1, @"Tree has only one entry");
+
+  KPKEntry *entry = [tree.root.entries lastObject];
+  NSMutableData *data = [[NSMutableData alloc] init];
+  NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];
+  [entry encodeWithCoder:archiver];
+  [archiver finishEncoding];
+  
+  NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:data];
+  KPKEntry *newEntry = [[KPKEntry alloc] initWithCoder:unarchiver];
+  [unarchiver finishDecoding];
+  
+  STAssertTrue([entry.title isEqualToString:newEntry.title], @"Entries must have same attributes");
 }
 
 @end