From 6b16e4d606cfeeb0c44497f40e47a55943f1ec70 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Sun, 26 Oct 2014 10:39:59 -0400 Subject: [PATCH] Remove USM from Mac app. --- External/Pearl | 2 +- MasterPassword/ObjC/Mac/MPMacAppDelegate.m | 45 +--- .../ObjC/Mac/MPPasswordWindowController.m | 22 +- .../ObjC/Mac/MasterPassword-Info.plist | 2 +- .../project.pbxproj | 2 +- .../project.pbxproj | 215 +++++++++--------- .../ObjC/iOS/MasterPassword-Info.plist | 2 +- 7 files changed, 122 insertions(+), 168 deletions(-) diff --git a/External/Pearl b/External/Pearl index a0e80c2d..ef628f38 160000 --- a/External/Pearl +++ b/External/Pearl @@ -1 +1 @@ -Subproject commit a0e80c2dfc96e95b3afbfc0d58a5ba1ff6fbf6c3 +Subproject commit ef628f388e70459725de21e3528831c705f88795 diff --git a/MasterPassword/ObjC/Mac/MPMacAppDelegate.m b/MasterPassword/ObjC/Mac/MPMacAppDelegate.m index 5efa2da2..0e2294e6 100644 --- a/MasterPassword/ObjC/Mac/MPMacAppDelegate.m +++ b/MasterPassword/ObjC/Mac/MPMacAppDelegate.m @@ -9,8 +9,6 @@ #import "MPMacAppDelegate.h" #import "MPAppDelegate_Key.h" #import "MPAppDelegate_Store.h" -#import "MPPasswordWindowController.h" -#import "PearlProfiler.h" #import #import @@ -82,11 +80,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven self.statusView.target = self; self.statusView.action = @selector( showMenu ); - [[NSNotificationCenter defaultCenter] addObserverForName:USMStoreDidChangeNotification object:nil - queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) { - [self updateUsers]; - }]; - [[NSNotificationCenter defaultCenter] addObserverForName:USMStoreDidImportChangesNotification object:nil + [[NSNotificationCenter defaultCenter] addObserverForName:NSPersistentStoreCoordinatorStoresDidChangeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) { [self updateUsers]; }]; @@ -178,9 +172,9 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven NSArray *jobs = (__bridge_transfer NSArray *)SMCopyAllJobDictionaries( kSMDomainUserLaunchd ); for (NSDictionary *job in jobs) - if ([LOGIN_HELPER_BUNDLE_ID isEqualToString:[job objectForKey:@"Label"]]) { - dbg( @"loginItemEnabled: %@", @([[job objectForKey:@"OnDemand"] boolValue]) ); - return [[job objectForKey:@"OnDemand"] boolValue]; + if ([LOGIN_HELPER_BUNDLE_ID isEqualToString:job[@"Label"]]) { + dbg( @"loginItemEnabled: %@", @([job[@"OnDemand"] boolValue]) ); + return [job[@"OnDemand"] boolValue]; } dbg( @"loginItemEnabled: not found" ); @@ -305,9 +299,9 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven - (IBAction)togglePreference:(id)sender { if (sender == self.hidePasswordsItem) - [MPConfig get].hidePasswords = [NSNumber numberWithBool:![[MPConfig get].hidePasswords boolValue]]; + [MPConfig get].hidePasswords = @(![[MPConfig get].hidePasswords boolValue]); if (sender == self.rememberPasswordItem) - [MPConfig get].rememberLogin = [NSNumber numberWithBool:![[MPConfig get].rememberLogin boolValue]]; + [MPConfig get].rememberLogin = @(![[MPConfig get].rememberLogin boolValue]); if (sender == self.openAtLoginItem) [self setLoginItemEnabled:self.openAtLoginItem.state != NSOnState]; if (sender == self.savePasswordItem) { @@ -409,13 +403,10 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven } // Don't show window if we weren't already running (ie. if we haven't been activated before). - PearlProfiler *profiler = [PearlProfiler profilerForTask:@"passwordWindowController"]; if (!self.passwordWindowController) self.passwordWindowController = [[MPPasswordWindowController alloc] initWithWindowNibName:@"MPPasswordWindowController"]; - [profiler finishJob:@"init"]; [self.passwordWindowController showWindow:self]; - [profiler finishJob:@"show"]; } #pragma mark - Private @@ -596,30 +587,6 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven } } -#pragma mark - UbiquityStoreManagerDelegate - -- (void)ubiquityStoreManager:(UbiquityStoreManager *)manager didLoadStoreForCoordinator:(NSPersistentStoreCoordinator *)coordinator - isCloud:(BOOL)isCloudStore { - - [super ubiquityStoreManager:manager didLoadStoreForCoordinator:coordinator isCloud:isCloudStore]; - - if (isCloudStore) { - NSAlert *alert = [NSAlert new]; - alert.messageText = @"iCloud Support Deprecated"; - alert.informativeText = @"Master Password is moving away from iCloud due to limited platform support and reliability issues. " - @"\n\nMaster Password's generated passwords do not require syncing. " - @"Your sites will always have the same passwords on all your devices. " - @"\n\niCloud continues to work for now but will be deactivated in a future update. " - @"Disable iCloud now to copy your iCloud sites to your device and avoid losing them when iCloud becomes discontinued."; - [alert addButtonWithTitle:@"Disable iCloud"]; - [alert addButtonWithTitle:@"Ignore For Now"]; - - NSInteger response = [alert runModal]; - if (response == NSAlertFirstButtonReturn) - [[self storeManager] migrateCloudToLocal]; - } -} - #pragma mark - PearlConfigDelegate - (void)didUpdateConfigForKey:(SEL)configKey fromValue:(id)oldValue { diff --git a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m index ee0e5453..6c18217e 100644 --- a/MasterPassword/ObjC/Mac/MPPasswordWindowController.m +++ b/MasterPassword/ObjC/Mac/MPPasswordWindowController.m @@ -20,9 +20,7 @@ #import "MPPasswordWindowController.h" #import "MPMacAppDelegate.h" #import "MPAppDelegate_Store.h" -#import "MPSiteModel.h" #import "MPAppDelegate_Key.h" -#import "PearlProfiler.h" #define MPAlertIncorrectMP @"MPAlertIncorrectMP" #define MPAlertChangeMP @"MPAlertChangeMP" @@ -34,8 +32,8 @@ @interface MPPasswordWindowController() -@property(nonatomic, copy) NSString *currentSiteText; @property(nonatomic, strong) CAGradientLayer *siteGradient; + @end @implementation MPPasswordWindowController { BOOL _skipTextChange; } @@ -511,15 +509,12 @@ return; } - PearlProfiler *profiler = [PearlProfiler profilerForTask:@"updateSites"]; NSString *query = [self query]; - [profiler finishJob:@"query"]; [MPMacAppDelegate managedObjectContextPerformBlockAndWait:^(NSManagedObjectContext *context) { NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPSiteEntity class] )]; - fetchRequest.sortDescriptors = [NSArray arrayWithObject:[[NSSortDescriptor alloc] initWithKey:@"lastUsed" ascending:NO]]; + fetchRequest.sortDescriptors = @[ [[NSSortDescriptor alloc] initWithKey:@"lastUsed" ascending:NO] ]; fetchRequest.predicate = [NSPredicate predicateWithFormat:@"(%@ == '' OR name BEGINSWITH[cd] %@) AND user == %@", query, query, [[MPMacAppDelegate get] activeUserInContext:context]]; - [profiler finishJob:@"setup fetch"]; NSError *error = nil; NSArray *siteResults = [context executeFetchRequest:fetchRequest error:&error]; @@ -527,16 +522,12 @@ err( @"While fetching sites for completion: %@", [error fullDescription] ); return; } - [profiler finishJob:@"do fetch"]; NSMutableArray *newSites = [NSMutableArray arrayWithCapacity:[siteResults count]]; for (MPSiteEntity *site in siteResults) [newSites addObject:[[MPSiteModel alloc] initWithEntity:site]]; - [profiler finishJob:@"make models"]; self.sites = newSites; - [profiler finishJob:@"update sites"]; }]; - [profiler finishJob:@"done"]; } - (void)updateSelection { @@ -590,7 +581,7 @@ - (void)copyContent:(NSString *)content { - [[NSPasteboard generalPasteboard] declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:nil]; + [[NSPasteboard generalPasteboard] declareTypes:@[ NSStringPboardType ] owner:nil]; if (![[NSPasteboard generalPasteboard] setString:content forType:NSPasteboardTypeString]) { wrn( @"Couldn't copy password to pasteboard." ); return; @@ -607,7 +598,6 @@ if ([self.window isOnActiveSpace] && self.window.alphaValue) return; - PearlProfiler *profiler = [PearlProfiler profilerForTask:@"fadeIn"]; CGDirectDisplayID displayID = [self.window.screen.deviceDescription[@"NSScreenNumber"] unsignedIntValue]; CGImageRef capturedImage = CGDisplayCreateImage( displayID ); if (!capturedImage || CGImageGetWidth( capturedImage ) <= 1) { @@ -615,11 +605,9 @@ return; } - [profiler finishJob:@"captured window: %d, on screen: %@", displayID, self.window.screen.deviceDescription]; NSImage *screenImage = [[NSImage alloc] initWithCGImage:capturedImage size:NSMakeSize( CGImageGetWidth( capturedImage ) / self.window.backingScaleFactor, CGImageGetHeight( capturedImage ) / self.window.backingScaleFactor )]; - [profiler finishJob:@"image size: %@, bytes: %ld", NSStringFromSize( screenImage.size ), screenImage.TIFFRepresentation.length]; NSImage *smallImage = [[NSImage alloc] initWithSize:NSMakeSize( CGImageGetWidth( capturedImage ) / 20, @@ -631,16 +619,12 @@ operation:NSCompositeSourceOver fraction:1.0]; [smallImage unlockFocus]; - [profiler finishJob:@"small image size: %@, bytes: %ld", NSStringFromSize( screenImage.size ), screenImage.TIFFRepresentation.length]; self.blurView.image = smallImage; - [profiler finishJob:@"assigned image"]; [self.window setFrame:self.window.screen.frame display:YES]; - [profiler finishJob:@"assigned frame"]; [NSAnimationContext currentContext].timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn]; self.window.animator.alphaValue = 1.0; - [profiler finishJob:@"animating window"]; } - (void)fadeOut { diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Info.plist b/MasterPassword/ObjC/Mac/MasterPassword-Info.plist index 0acabfa0..8d7d0c3b 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Info.plist +++ b/MasterPassword/ObjC/Mac/MasterPassword-Info.plist @@ -62,7 +62,7 @@ LSUIElement NSHumanReadableCopyright - Copyright © 2011-2013 Lyndir. All rights reserved. + Copyright © 2011-2014 Lyndir NSMainNibFile MainMenu NSPrincipalClass diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj b/MasterPassword/ObjC/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj index 5d5c3c0b..90c15d54 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/Mac/MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj/project.pbxproj @@ -103,7 +103,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = MP; - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0600; ORGANIZATIONNAME = "Maarten Billemont"; TargetAttributes = { DAD9B5C0176299B9001835F9 = { diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj index 0ba0f324..70445f63 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj @@ -22,7 +22,6 @@ DA0933D01747B91B00DE1CEF /* appstore.png in Resources */ = {isa = PBXBuildFile; fileRef = DA0933CF1747B91B00DE1CEF /* appstore.png */; }; DA10007F1998A4C6002B873F /* scrypt in Headers */ = {isa = PBXBuildFile; fileRef = DAE8E65619867AF500416A0F /* scrypt */; settings = {ATTRIBUTES = (Public, ); }; }; DA1000801998A4C6002B873F /* openssl in Headers */ = {isa = PBXBuildFile; fileRef = DAE8E65719867AF500416A0F /* openssl */; settings = {ATTRIBUTES = (Public, ); }; }; - DA16B33F170661D4000A0EAB /* libUbiquityStoreManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */; }; DA16B341170661DB000A0EAB /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA16B340170661DB000A0EAB /* Carbon.framework */; }; DA16B342170661E0000A0EAB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC632871486D95D0075AEA5 /* Security.framework */; }; DA16B344170661EE000A0EAB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA16B343170661EE000A0EAB /* Cocoa.framework */; }; @@ -55,7 +54,6 @@ DA3B8453190FC86F00246EEA /* NSManagedObject+Pearl.h in Headers */ = {isa = PBXBuildFile; fileRef = DA3B8451190FC86F00246EEA /* NSManagedObject+Pearl.h */; }; DA3B8456190FC89700246EEA /* MPFixable.m in Sources */ = {isa = PBXBuildFile; fileRef = DA3B8454190FC89700246EEA /* MPFixable.m */; }; DA3BCFCD19BD09E0006B2681 /* SourceCodePro-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = DA3BCFCC19BD09E0006B2681 /* SourceCodePro-Regular.otf */; }; - DA4425CC1557BED40052177D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6326C148680650075AEA5 /* libjrswizzle.a */; }; DA5E5C9417248AA1003798D8 /* libscryptenc-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5E5C8717248AA1003798D8 /* libscryptenc-osx.a */; }; DA5E5CF61724A667003798D8 /* MPAlgorithm.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5C981724A667003798D8 /* MPAlgorithm.m */; }; @@ -80,15 +78,17 @@ DA8ED896192906920099B726 /* PearlTween.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8ED892192906920099B726 /* PearlTween.h */; }; DA8ED897192906920099B726 /* map-macro.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8ED894192906920099B726 /* map-macro.h */; }; DAAA81B0195A8D1300FA30D9 /* gradient.png in Resources */ = {isa = PBXBuildFile; fileRef = DAAA81AF195A8D1300FA30D9 /* gradient.png */; }; + DAADCC4719FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h in Headers */ = {isa = PBXBuildFile; fileRef = DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */; }; + DAADCC4819FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h in Headers */ = {isa = PBXBuildFile; fileRef = DAADCC3F19FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h */; }; + DAADCC4919FAFFAD00987B1D /* NSPersistentStore+PearlMigration.m in Sources */ = {isa = PBXBuildFile; fileRef = DAADCC4019FAFFAD00987B1D /* NSPersistentStore+PearlMigration.m */; }; + DAADCC4B19FB000C00987B1D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAEBC45214F6364500987BF6 /* QuartzCore.framework */; }; + DAADCC6919FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.m in Sources */ = {isa = PBXBuildFile; fileRef = DAADCC6719FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.m */; }; + DAADCC6A19FB00B500987B1D /* libKCOrderedAccessorFix.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAADCC5019FB006500987B1D /* libKCOrderedAccessorFix.a */; }; DABC6C02175D8C85000C15D4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; DABC6C15175D8CE1000C15D4 /* RHStatusItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = DABC6C14175D8CE1000C15D4 /* RHStatusItemView.m */; }; DABC6C16175D8E3A000C15D4 /* libRHStatusItemView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DABC6C01175D8C85000C15D4 /* libRHStatusItemView.a */; }; DAC6326D148680650075AEA5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; }; - DACA22BB1705DE7D002C6C22 /* UbiquityStoreManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA22B71705DE7D002C6C22 /* UbiquityStoreManager.m */; }; - DACA22BC1705DE7D002C6C22 /* NSError+UbiquityStoreManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA22B81705DE7D002C6C22 /* NSError+UbiquityStoreManager.h */; }; - DACA22BD1705DE7D002C6C22 /* NSError+UbiquityStoreManager.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA22B91705DE7D002C6C22 /* NSError+UbiquityStoreManager.m */; }; - DACA22BE1705DE7D002C6C22 /* UbiquityStoreManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA22BA1705DE7D002C6C22 /* UbiquityStoreManager.h */; }; DACA26FE1705DF81002C6C22 /* logo-bare.png in Resources */ = {isa = PBXBuildFile; fileRef = DACA241C1705DF7D002C6C22 /* logo-bare.png */; }; DACA27121705DF81002C6C22 /* avatar-13@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DACA24321705DF7D002C6C22 /* avatar-13@2x.png */; }; DACA27131705DF81002C6C22 /* avatar-3@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DACA24331705DF7D002C6C22 /* avatar-3@2x.png */; }; @@ -213,6 +213,15 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + DAADCC4E19FB006500987B1D /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "include/$(PRODUCT_NAME)"; + dstSubfolderSpec = 16; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; DAD9B5EE1762CA3A001835F9 /* Copy LoginHelper */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -292,7 +301,6 @@ DA3B8454190FC89700246EEA /* MPFixable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPFixable.m; sourceTree = ""; }; DA3B8455190FC89700246EEA /* MPFixable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPFixable.h; sourceTree = ""; }; DA3BCFCC19BD09E0006B2681 /* SourceCodePro-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SourceCodePro-Regular.otf"; sourceTree = ""; }; - DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libUbiquityStoreManager.a; sourceTree = BUILT_PRODUCTS_DIR; }; DA5BFA44147E415C00F98B1E /* Master Password.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Master Password.app"; sourceTree = BUILT_PRODUCTS_DIR; }; DA5BFA4A147E415C00F98B1E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; DA5BFA4C147E415C00F98B1E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -737,6 +745,12 @@ DA8ED892192906920099B726 /* PearlTween.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlTween.h; sourceTree = ""; }; DA8ED894192906920099B726 /* map-macro.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "map-macro.h"; sourceTree = ""; }; DAAA81AF195A8D1300FA30D9 /* gradient.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = gradient.png; sourceTree = ""; }; + DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+PearlEasyCleanup.h"; sourceTree = ""; }; + DAADCC3F19FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSPersistentStore+PearlMigration.h"; sourceTree = ""; }; + DAADCC4019FAFFAD00987B1D /* NSPersistentStore+PearlMigration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSPersistentStore+PearlMigration.m"; sourceTree = ""; }; + DAADCC5019FB006500987B1D /* libKCOrderedAccessorFix.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libKCOrderedAccessorFix.a; sourceTree = BUILT_PRODUCTS_DIR; }; + DAADCC6619FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSManagedObjectModel+KCOrderedAccessorFix.h"; sourceTree = ""; }; + DAADCC6719FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSManagedObjectModel+KCOrderedAccessorFix.m"; sourceTree = ""; }; DABB981515100B4000B05417 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; DABC6C01175D8C85000C15D4 /* libRHStatusItemView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRHStatusItemView.a; sourceTree = BUILT_PRODUCTS_DIR; }; DABC6C13175D8CE1000C15D4 /* RHStatusItemView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RHStatusItemView.h; sourceTree = ""; }; @@ -745,10 +759,6 @@ DAC632871486D95D0075AEA5 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; DAC77CAD148291A600BCF976 /* libPearl.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPearl.a; sourceTree = BUILT_PRODUCTS_DIR; }; DAC77CB1148291A600BCF976 /* Pearl-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "Pearl-Prefix.pch"; path = "../../MasterPassword/ObjC/Pearl/Pearl-Prefix.pch"; sourceTree = ""; }; - DACA22B71705DE7D002C6C22 /* UbiquityStoreManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UbiquityStoreManager.m; sourceTree = ""; }; - DACA22B81705DE7D002C6C22 /* NSError+UbiquityStoreManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSError+UbiquityStoreManager.h"; sourceTree = ""; }; - DACA22B91705DE7D002C6C22 /* NSError+UbiquityStoreManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSError+UbiquityStoreManager.m"; sourceTree = ""; }; - DACA22BA1705DE7D002C6C22 /* UbiquityStoreManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UbiquityStoreManager.h; sourceTree = ""; }; DACA241C1705DF7D002C6C22 /* logo-bare.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo-bare.png"; sourceTree = ""; }; DACA24321705DF7D002C6C22 /* avatar-13@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "avatar-13@2x.png"; sourceTree = ""; }; DACA24331705DF7D002C6C22 /* avatar-3@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "avatar-3@2x.png"; sourceTree = ""; }; @@ -862,22 +872,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DA4425C81557BED40052177D /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - DA4425CC1557BED40052177D /* Foundation.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DA5BFA41147E415C00F98B1E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + DAADCC6A19FB00B500987B1D /* libKCOrderedAccessorFix.a in Frameworks */, DA250925195148E200AC23F1 /* QuartzCore.framework in Frameworks */, DAD9B5F01762CAA4001835F9 /* ServiceManagement.framework in Frameworks */, DABC6C16175D8E3A000C15D4 /* libRHStatusItemView.a in Frameworks */, - DA16B33F170661D4000A0EAB /* libUbiquityStoreManager.a in Frameworks */, DA16B341170661DB000A0EAB /* Carbon.framework in Frameworks */, DA16B342170661E0000A0EAB /* Security.framework in Frameworks */, DA16B345170661F2000A0EAB /* libPearl.a in Frameworks */, @@ -886,6 +888,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + DAADCC4D19FB006500987B1D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; DABC6BFE175D8C85000C15D4 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -906,6 +915,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + DAADCC4B19FB000C00987B1D /* QuartzCore.framework in Frameworks */, DAE8E65519867AE200416A0F /* libopensslcrypto-osx.a in Frameworks */, DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */, DAC77CAE148291A600BCF976 /* Foundation.framework in Frameworks */, @@ -953,9 +963,9 @@ DA5BFA44147E415C00F98B1E /* Master Password.app */, DAC77CAD148291A600BCF976 /* libPearl.a */, DAC6326C148680650075AEA5 /* libjrswizzle.a */, - DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */, DABC6C01175D8C85000C15D4 /* libRHStatusItemView.a */, DA2508F619513C1400AC23F1 /* libRMBlurredView.a */, + DAADCC5019FB006500987B1D /* libKCOrderedAccessorFix.a */, ); name = Products; sourceTree = ""; @@ -1480,6 +1490,15 @@ path = include; sourceTree = ""; }; + DAADCC6819FB007F00987B1D /* KCOrderedAccessorFix */ = { + isa = PBXGroup; + children = ( + DAADCC6619FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.h */, + DAADCC6719FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.m */, + ); + path = KCOrderedAccessorFix; + sourceTree = ""; + }; DABC6C0E175D8CE1000C15D4 /* RHStatusItemView */ = { isa = PBXGroup; children = ( @@ -1503,28 +1522,16 @@ DACA22121705DDC5002C6C22 /* External */ = { isa = PBXGroup; children = ( + DAADCC6819FB007F00987B1D /* KCOrderedAccessorFix */, DA3B8449190FC5A900246EEA /* Mac */, DABC6C0E175D8CE1000C15D4 /* RHStatusItemView */, DACA29751705E2BD002C6C22 /* jrswizzle */, DAC77CAF148291A600BCF976 /* Pearl */, - DACA22B61705DE7D002C6C22 /* UbiquityStoreManager */, ); name = External; path = ../../../External; sourceTree = ""; }; - DACA22B61705DE7D002C6C22 /* UbiquityStoreManager */ = { - isa = PBXGroup; - children = ( - DACA22BA1705DE7D002C6C22 /* UbiquityStoreManager.h */, - DACA22B71705DE7D002C6C22 /* UbiquityStoreManager.m */, - DACA22B81705DE7D002C6C22 /* NSError+UbiquityStoreManager.h */, - DACA22B91705DE7D002C6C22 /* NSError+UbiquityStoreManager.m */, - ); - name = UbiquityStoreManager; - path = UbiquityStoreManager/UbiquityStoreManager; - sourceTree = ""; - }; DACA23B41705DF7D002C6C22 /* Resources */ = { isa = PBXGroup; children = ( @@ -1636,8 +1643,7 @@ DACA29771705E2BD002C6C22 /* JRSwizzle.h */, DACA298C1705E2BD002C6C22 /* JRSwizzle.m */, ); - name = jrswizzle; - path = Pearl/External/jrswizzle; + path = jrswizzle; sourceTree = ""; }; DAD9B5E2176299B9001835F9 /* Products */ = { @@ -1660,6 +1666,9 @@ DAFE45D715039823003ABA7C /* Pearl */ = { isa = PBXGroup; children = ( + DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */, + DAADCC3F19FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h */, + DAADCC4019FAFFAD00987B1D /* NSPersistentStore+PearlMigration.m */, DA8ED891192906920099B726 /* PearlTween.m */, DA8ED892192906920099B726 /* PearlTween.h */, DA8ED893192906920099B726 /* include */, @@ -1757,15 +1766,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DA4425C91557BED40052177D /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - DACA22BC1705DE7D002C6C22 /* NSError+UbiquityStoreManager.h in Headers */, - DACA22BE1705DE7D002C6C22 /* UbiquityStoreManager.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DAC6326A148680650075AEA5 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1807,12 +1807,14 @@ DAFE4A3A15039824003ABA7C /* PearlSCrypt.h in Headers */, DA30E9CE15722ECA00A68B4C /* NSBundle+PearlMutableInfo.h in Headers */, DA30E9D715723E6900A68B4C /* PearlLazy.h in Headers */, + DAADCC4719FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h in Headers */, DAFE4A63150399FF003ABA88 /* NSObject+PearlKVO.h in Headers */, DAFE4A63150399FF003ABA94 /* NSDateFormatter+RFC3339.h in Headers */, 93D39C34FE35830EF5BE1D2A /* NSArray+Indexing.h in Headers */, 93D392EC39DA43C46C692C12 /* NSDictionary+Indexing.h in Headers */, DA3509FE15F101A500C14A8E /* PearlQueue.h in Headers */, DA2CA4EE18D323D3007798F8 /* NSError+PearlFullDescription.h in Headers */, + DAADCC4819FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h in Headers */, 93D39D304F73B3BBA031522A /* PearlProfiler.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1837,23 +1839,6 @@ productReference = DA2508F619513C1400AC23F1 /* libRMBlurredView.a */; productType = "com.apple.product-type.library.static"; }; - DA4425CA1557BED40052177D /* UbiquityStoreManager */ = { - isa = PBXNativeTarget; - buildConfigurationList = DA4425D31557BED40052177D /* Build configuration list for PBXNativeTarget "UbiquityStoreManager" */; - buildPhases = ( - DA4425C71557BED40052177D /* Sources */, - DA4425C81557BED40052177D /* Frameworks */, - DA4425C91557BED40052177D /* Headers */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = UbiquityStoreManager; - productName = iCloudStoreManager; - productReference = DA4425CB1557BED40052177D /* libUbiquityStoreManager.a */; - productType = "com.apple.product-type.library.static"; - }; DA5BFA43147E415C00F98B1E /* MasterPassword */ = { isa = PBXNativeTarget; buildConfigurationList = DA5BFA6D147E415C00F98B1E /* Build configuration list for PBXNativeTarget "MasterPassword" */; @@ -1875,6 +1860,23 @@ productReference = DA5BFA44147E415C00F98B1E /* Master Password.app */; productType = "com.apple.product-type.application"; }; + DAADCC4F19FB006500987B1D /* KCOrderedAccessorFix */ = { + isa = PBXNativeTarget; + buildConfigurationList = DAADCC5E19FB006500987B1D /* Build configuration list for PBXNativeTarget "KCOrderedAccessorFix" */; + buildPhases = ( + DAADCC4C19FB006500987B1D /* Sources */, + DAADCC4D19FB006500987B1D /* Frameworks */, + DAADCC4E19FB006500987B1D /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = KCOrderedAccessorFix; + productName = KCOrderedAccessorFix; + productReference = DAADCC5019FB006500987B1D /* libKCOrderedAccessorFix.a */; + productType = "com.apple.product-type.library.static"; + }; DABC6C00175D8C85000C15D4 /* RHStatusItemView */ = { isa = PBXNativeTarget; buildConfigurationList = DABC6C0A175D8C85000C15D4 /* Build configuration list for PBXNativeTarget "RHStatusItemView" */; @@ -1946,6 +1948,9 @@ }; }; }; + DAADCC4F19FB006500987B1D = { + CreatedOnToolsVersion = 6.0.1; + }; }; }; buildConfigurationList = DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-Mac" */; @@ -1954,6 +1959,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + nl, ); mainGroup = DA5BFA39147E415C00F98B1E; productRefGroup = DA5BFA45147E415C00F98B1E /* Products */; @@ -1969,9 +1975,9 @@ DA5BFA43147E415C00F98B1E /* MasterPassword */, DAC77CAC148291A600BCF976 /* Pearl */, DAC6326B148680650075AEA5 /* jrswizzle */, - DA4425CA1557BED40052177D /* UbiquityStoreManager */, DABC6C00175D8C85000C15D4 /* RHStatusItemView */, DA2508F519513C1400AC23F1 /* RMBlurredView */, + DAADCC4F19FB006500987B1D /* KCOrderedAccessorFix */, ); }; /* End PBXProject section */ @@ -2112,15 +2118,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DA4425C71557BED40052177D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DACA22BB1705DE7D002C6C22 /* UbiquityStoreManager.m in Sources */, - DACA22BD1705DE7D002C6C22 /* NSError+UbiquityStoreManager.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; DA5BFA40147E415C00F98B1E /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2152,6 +2149,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + DAADCC4C19FB006500987B1D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + DAADCC6919FB007F00987B1D /* NSManagedObjectModel+KCOrderedAccessorFix.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; DABC6BFD175D8C85000C15D4 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2173,6 +2178,7 @@ buildActionMask = 2147483647; files = ( DAFE4A1415039824003ABA7C /* NSObject+PearlExport.m in Sources */, + DAADCC4919FAFFAD00987B1D /* NSPersistentStore+PearlMigration.m in Sources */, DAFE4A1615039824003ABA7C /* NSString+PearlNSArrayFormat.m in Sources */, DAFE4A1815039824003ABA7C /* NSString+PearlSEL.m in Sources */, DA2CA4ED18D323D3007798F8 /* NSError+PearlFullDescription.m in Sources */, @@ -2274,30 +2280,6 @@ }; name = "AppStore-Mac"; }; - DA4425D41557BED40052177D /* Debug-Mac */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = YES; - COMBINE_HIDPI_IMAGES = YES; - }; - name = "Debug-Mac"; - }; - DA4425D51557BED40052177D /* AdHoc-Mac */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = YES; - COMBINE_HIDPI_IMAGES = YES; - }; - name = "AdHoc-Mac"; - }; - DA4425D61557BED40052177D /* AppStore-Mac */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ENABLE_OBJC_ARC = YES; - COMBINE_HIDPI_IMAGES = YES; - }; - name = "AppStore-Mac"; - }; DA5BFA6B147E415C00F98B1E /* Debug-Mac */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2630,6 +2612,27 @@ }; name = "AppStore-Mac"; }; + DAADCC5F19FB006500987B1D /* Debug-Mac */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_ARC = YES; + }; + name = "Debug-Mac"; + }; + DAADCC6019FB006500987B1D /* AdHoc-Mac */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_ARC = YES; + }; + name = "AdHoc-Mac"; + }; + DAADCC6119FB006500987B1D /* AppStore-Mac */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ENABLE_OBJC_ARC = YES; + }; + name = "AppStore-Mac"; + }; DABC6C0B175D8C85000C15D4 /* Debug-Mac */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2730,16 +2733,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = "AdHoc-Mac"; }; - DA4425D31557BED40052177D /* Build configuration list for PBXNativeTarget "UbiquityStoreManager" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DA4425D41557BED40052177D /* Debug-Mac */, - DA4425D51557BED40052177D /* AdHoc-Mac */, - DA4425D61557BED40052177D /* AppStore-Mac */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = "AdHoc-Mac"; - }; DA5BFA3E147E415C00F98B1E /* Build configuration list for PBXProject "MasterPassword-Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -2760,6 +2753,16 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = "AdHoc-Mac"; }; + DAADCC5E19FB006500987B1D /* Build configuration list for PBXNativeTarget "KCOrderedAccessorFix" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DAADCC5F19FB006500987B1D /* Debug-Mac */, + DAADCC6019FB006500987B1D /* AdHoc-Mac */, + DAADCC6119FB006500987B1D /* AppStore-Mac */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = "AdHoc-Mac"; + }; DABC6C0A175D8C85000C15D4 /* Build configuration list for PBXNativeTarget "RHStatusItemView" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/MasterPassword/ObjC/iOS/MasterPassword-Info.plist b/MasterPassword/ObjC/iOS/MasterPassword-Info.plist index d5355489..6eb7f0af 100644 --- a/MasterPassword/ObjC/iOS/MasterPassword-Info.plist +++ b/MasterPassword/ObjC/iOS/MasterPassword-Info.plist @@ -46,7 +46,7 @@ LSRequiresIPhoneOS NSHumanReadableCopyright - © 2011-2014, Lyndir + Copyright © 2011-2014 Lyndir UIAppFonts Exo2.0-Bold.otf