skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Reformat.

Browse Source
This commit is contained in:
Maarten Billemont 2013-04-20 14:11:19 -04:00
parent c0d57b5561
commit 95d5d8b40c
69 changed files with 1532 additions and 1522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
External/Pearl vendored

@ -1 +1 @@
Subproject commit 737b198043a3acb3a262a38a8b14e265801ce682 Subproject commit affcd43c4e50b99f12da5b3cf342bc6fab6e0298

3
MasterPassword/ObjC/MPAlgorithm.m
View File

@ -24,8 +24,7 @@ id<MPAlgorithm> MPAlgorithmForVersion(NSUInteger version) {
versionToAlgorithm = [NSMutableDictionary dictionary]; versionToAlgorithm = [NSMutableDictionary dictionary];
id<MPAlgorithm> algorithm = [versionToAlgorithm objectForKey:@(version)]; id<MPAlgorithm> algorithm = [versionToAlgorithm objectForKey:@(version)];
if (!algorithm) if (!algorithm) if ((algorithm = [NSClassFromString( PearlString( @"MPAlgorithmV%lu", (unsigned long)version ) ) new]))
if ((algorithm = [NSClassFromString(PearlString(@"MPAlgorithmV%lu", (unsigned long)version)) new]))
[versionToAlgorithm setObject:algorithm forKey:@(version)]; [versionToAlgorithm setObject:algorithm forKey:@(version)];
return algorithm; return algorithm;

1
MasterPassword/ObjC/MPAlgorithmV1.h
View File

@ -17,6 +17,5 @@
#import "MPAlgorithmV0.h" #import "MPAlgorithmV0.h"
@interface MPAlgorithmV1 : MPAlgorithmV0 @interface MPAlgorithmV1 : MPAlgorithmV0
@end @end

2
MasterPassword/ObjC/MPAlgorithmV1.m
View File

@ -18,7 +18,6 @@
#import "MPAlgorithmV1.h" #import "MPAlgorithmV1.h"
#import "MPEntities.h" #import "MPEntities.h"
@implementation MPAlgorithmV1 @implementation MPAlgorithmV1
- (NSUInteger)version { - (NSUInteger)version {
@ -92,5 +91,4 @@
return content; return content;
} }
@end @end

14
MasterPassword/ObjC/MPAppDelegate_Key.m
View File

@ -84,8 +84,7 @@ static NSDictionary *keyQuery(MPUserEntity *user) {
// Method 1: When the user has no keyID set, set a new key from the given master password. // Method 1: When the user has no keyID set, set a new key from the given master password.
if (!user.keyID) { if (!user.keyID) {
if ([password length]) if ([password length]) if ((tryKey = [MPAlgorithmDefault keyForPassword:password ofUserNamed:user.name])) {
if ((tryKey = [MPAlgorithmDefault keyForPassword:password ofUserNamed:user.name])) {
user.keyID = tryKey.keyID; user.keyID = tryKey.keyID;
// Migrate existing elements. // Migrate existing elements.
@ -98,11 +97,9 @@ static NSDictionary *keyQuery(MPUserEntity *user) {
// Key should not be stored in keychain. Delete it. // Key should not be stored in keychain. Delete it.
[self forgetSavedKeyFor:user]; [self forgetSavedKeyFor:user];
else else if (!tryKey) {
if (!tryKey) {
// Key should be saved in keychain. Load it. // Key should be saved in keychain. Load it.
if ((tryKey = [self loadSavedKeyFor:user])) if ((tryKey = [self loadSavedKeyFor:user])) if (![user.keyID isEqual:tryKey.keyID]) {
if (![user.keyID isEqual:tryKey.keyID]) {
// Loaded password doesn't match user's keyID. Forget saved password: it is incorrect. // Loaded password doesn't match user's keyID. Forget saved password: it is incorrect.
inf(@"Saved password doesn't match keyID for: %@", user.userID); inf(@"Saved password doesn't match keyID for: %@", user.userID);
@ -113,9 +110,8 @@ static NSDictionary *keyQuery(MPUserEntity *user) {
// Method 3: Check the given master password string. // Method 3: Check the given master password string.
if (!tryKey) { if (!tryKey) {
if ([password length]) if ([password length]) if ((tryKey = [MPAlgorithmDefault keyForPassword:password
if ((tryKey = [MPAlgorithmDefault keyForPassword:password ofUserNamed:user.name])) ofUserNamed:user.name])) if (![user.keyID isEqual:tryKey.keyID]) {
if (![user.keyID isEqual:tryKey.keyID]) {
inf(@"Key derived from password doesn't match keyID for: %@", user.userID); inf(@"Key derived from password doesn't match keyID for: %@", user.userID);
tryKey = nil; tryKey = nil;

16
MasterPassword/ObjC/MPAppDelegate_Store.m
View File

@ -31,7 +31,8 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
if ([[NSThread currentThread] isMainThread]) if ([[NSThread currentThread] isMainThread])
return mainManagedObjectContext; return mainManagedObjectContext;
NSManagedObjectContext *threadManagedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSConfinementConcurrencyType]; NSManagedObjectContext
*threadManagedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSConfinementConcurrencyType];
threadManagedObjectContext.parentContext = mainManagedObjectContext; threadManagedObjectContext.parentContext = mainManagedObjectContext;
return threadManagedObjectContext; return threadManagedObjectContext;
@ -338,7 +339,8 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
} ); } );
// Create our contexts. // Create our contexts.
NSManagedObjectContext *privateManagedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType]; NSManagedObjectContext
*privateManagedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
[privateManagedObjectContext performBlockAndWait:^{ [privateManagedObjectContext performBlockAndWait:^{
privateManagedObjectContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy; privateManagedObjectContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy;
privateManagedObjectContext.persistentStoreCoordinator = coordinator; privateManagedObjectContext.persistentStoreCoordinator = coordinator;
@ -531,8 +533,8 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
if (!existingSites) { if (!existingSites) {
err(@"Lookup of existing sites failed for site: %@, user: %@, error: %@", name, user.userID, error); err(@"Lookup of existing sites failed for site: %@, user: %@, error: %@", name, user.userID, error);
return MPImportResultInternalError; return MPImportResultInternalError;
} else }
if (existingSites.count) else if (existingSites.count)
dbg(@"Existing sites: %@", existingSites); dbg(@"Existing sites: %@", existingSites);
[elementsToDelete addObjectsFromArray:existingSites]; [elementsToDelete addObjectsFromArray:existingSites];
@ -580,7 +582,8 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
NSString *exportContent = [siteElements objectAtIndex:5]; NSString *exportContent = [siteElements objectAtIndex:5];
// Create new site. // Create new site.
MPElementEntity *element = [NSEntityDescription insertNewObjectForEntityForName:[MPAlgorithmForVersion(version) classNameOfType:type] MPElementEntity
*element = [NSEntityDescription insertNewObjectForEntityForName:[MPAlgorithmForVersion( version ) classNameOfType:type]
inManagedObjectContext:moc]; inManagedObjectContext:moc];
element.name = name; element.name = name;
element.user = user; element.user = user;
@ -655,8 +658,7 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
if (!(type & MPElementFeatureDevicePrivate)) { if (!(type & MPElementFeatureDevicePrivate)) {
if (showPasswords) if (showPasswords)
content = element.content; content = element.content;
else else if (type & MPElementFeatureExportContent)
if (type & MPElementFeatureExportContent)
content = element.exportContent; content = element.exportContent;
} }

7
MasterPassword/ObjC/MPConfig.m
View File

@ -9,6 +9,7 @@
#import "MPAppDelegate.h" #import "MPAppDelegate.h"
@implementation MPConfig @implementation MPConfig
@dynamic sendInfo, rememberLogin, iCloudDecided; @dynamic sendInfo, rememberLogin, iCloudDecided;
- (id)init { - (id)init {
@ -16,11 +17,13 @@
if (!(self = [super init])) if (!(self = [super init]))
return nil; return nil;
[self.defaults registerDefaults:@{NSStringFromSelector(@selector(askForReviews)): @YES, [self.defaults registerDefaults:@{
NSStringFromSelector( @selector(askForReviews) ) : @YES,
NSStringFromSelector( @selector(sendInfo) ) : @NO, NSStringFromSelector( @selector(sendInfo) ) : @NO,
NSStringFromSelector( @selector(rememberLogin) ) : @NO, NSStringFromSelector( @selector(rememberLogin) ) : @NO,
NSStringFromSelector(@selector(iCloudDecided)): @NO}]; NSStringFromSelector( @selector(iCloudDecided) ) : @NO
}];
self.delegate = [MPAppDelegate get]; self.delegate = [MPAppDelegate get];

2
MasterPassword/ObjC/MPElementEntity.m
View File

@ -7,8 +7,6 @@
// //
#import "MPElementEntity.h" #import "MPElementEntity.h"
#import "MPUserEntity.h"
@implementation MPElementEntity @implementation MPElementEntity

1
MasterPassword/ObjC/MPElementGeneratedEntity.h
View File

@ -10,7 +10,6 @@
#import <CoreData/CoreData.h> #import <CoreData/CoreData.h>
#import "MPElementEntity.h" #import "MPElementEntity.h"
@interface MPElementGeneratedEntity : MPElementEntity @interface MPElementGeneratedEntity : MPElementEntity
@property(nonatomic, retain) NSNumber *counter_; @property(nonatomic, retain) NSNumber *counter_;

1
MasterPassword/ObjC/MPElementGeneratedEntity.m
View File

@ -8,7 +8,6 @@
#import "MPElementGeneratedEntity.h" #import "MPElementGeneratedEntity.h"
@implementation MPElementGeneratedEntity @implementation MPElementGeneratedEntity
@dynamic counter_; @dynamic counter_;

1
MasterPassword/ObjC/MPElementStoredEntity.h
View File

@ -10,7 +10,6 @@
#import <CoreData/CoreData.h> #import <CoreData/CoreData.h>
#import "MPElementEntity.h" #import "MPElementEntity.h"
@interface MPElementStoredEntity : MPElementEntity @interface MPElementStoredEntity : MPElementEntity
@property(nonatomic, retain) id contentObject; @property(nonatomic, retain) id contentObject;

1
MasterPassword/ObjC/MPElementStoredEntity.m
View File

@ -8,7 +8,6 @@
#import "MPElementStoredEntity.h" #import "MPElementStoredEntity.h"
@implementation MPElementStoredEntity @implementation MPElementStoredEntity
@dynamic contentObject; @dynamic contentObject;

12
MasterPassword/ObjC/MPEntities.m
View File

@ -146,11 +146,9 @@
} }
- (void)importProtectedContent:(NSString *)protectedContent protectedByKey:(MPKey *)contentProtectionKey usingKey:(MPKey *)key { - (void)importProtectedContent:(NSString *)protectedContent protectedByKey:(MPKey *)contentProtectionKey usingKey:(MPKey *)key {
} }
- (void)importClearTextContent:(NSString *)clearContent usingKey:(MPKey *)key { - (void)importClearTextContent:(NSString *)clearContent usingKey:(MPKey *)key {
} }
- (NSString *)description { - (NSString *)description {
@ -204,7 +202,6 @@
return [self.algorithm generateContentForElement:self usingKey:key]; return [self.algorithm generateContentForElement:self usingKey:key];
} }
@end @end
@implementation MPElementStoredEntity(MP) @implementation MPElementStoredEntity(MP)
@ -212,8 +209,10 @@
+ (NSDictionary *)queryForDevicePrivateElementNamed:(NSString *)name { + (NSDictionary *)queryForDevicePrivateElementNamed:(NSString *)name {
return [PearlKeyChain createQueryForClass:kSecClassGenericPassword return [PearlKeyChain createQueryForClass:kSecClassGenericPassword
attributes:@{(__bridge id)kSecAttrService: @"DevicePrivate", attributes:@{
(__bridge id)kSecAttrAccount: name} (__bridge id)kSecAttrService : @"DevicePrivate",
(__bridge id)kSecAttrAccount : name
}
matches:nil]; matches:nil];
} }
@ -263,7 +262,8 @@
#endif #endif
nil]]; nil]];
self.contentObject = nil; self.contentObject = nil;
} else }
else
self.contentObject = encryptedContent; self.contentObject = encryptedContent;
} }

1
MasterPassword/ObjC/MPKey.h
View File

@ -19,7 +19,6 @@
@protocol MPAlgorithm; @protocol MPAlgorithm;
@interface MPKey : NSObject @interface MPKey : NSObject
@property(nonatomic, readonly, strong) id<MPAlgorithm> algorithm; @property(nonatomic, readonly, strong) id<MPAlgorithm> algorithm;

3
MasterPassword/ObjC/MPKey.m
View File

@ -17,7 +17,6 @@
#import "MPAlgorithm.h" #import "MPAlgorithm.h"
@interface MPKey() @interface MPKey()
@property(nonatomic, readwrite, strong) id<MPAlgorithm> algorithm; @property(nonatomic, readwrite, strong) id<MPAlgorithm> algorithm;
@ -27,6 +26,7 @@
@end @end
@implementation MPKey @implementation MPKey
@synthesize algorithm = _algorithm, keyData = _keyData, keyID = _keyID; @synthesize algorithm = _algorithm, keyData = _keyData, keyID = _keyID;
- (id)initWithKeyData:(NSData *)keyData algorithm:(id<MPAlgorithm>)algorithm { - (id)initWithKeyData:(NSData *)keyData algorithm:(id<MPAlgorithm>)algorithm {
@ -61,5 +61,4 @@
return [self isEqualToKey:object]; return [self isEqualToKey:object];
} }
@end @end

2
MasterPassword/ObjC/MPUserEntity.m
View File

@ -7,8 +7,6 @@
// //
#import "MPUserEntity.h" #import "MPUserEntity.h"
#import "MPElementEntity.h"
@implementation MPUserEntity @implementation MPUserEntity

25
MasterPassword/ObjC/Mac/MPAppDelegate.m
View File

@ -11,8 +11,8 @@
#import "MPAppDelegate_Store.h" #import "MPAppDelegate_Store.h"
#import <Carbon/Carbon.h> #import <Carbon/Carbon.h>
@implementation MPAppDelegate @implementation MPAppDelegate
@synthesize statusItem; @synthesize statusItem;
@synthesize lockItem; @synthesize lockItem;
@synthesize showItem; @synthesize showItem;
@ -163,8 +163,8 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
- (void)didUpdateConfigForKey:(SEL)configKey fromValue:(id)oldValue { - (void)didUpdateConfigForKey:(SEL)configKey fromValue:(id)oldValue {
[[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification [[NSNotificationCenter defaultCenter]
object:NSStringFromSelector(configKey) userInfo:nil]; postNotificationName:MPCheckConfigNotification object:NSStringFromSelector( configKey ) userInfo:nil];
} }
#pragma mark - NSApplicationDelegate #pragma mark - NSApplicationDelegate
@ -204,8 +204,8 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
^(NSNotification *note) { ^(NSNotification *note) {
[self updateUsers]; [self updateUsers];
}]; }];
[[NSNotificationCenter defaultCenter] addObserverForName:UbiquityManagedStoreDidImportChangesNotification object:nil queue:nil [[NSNotificationCenter defaultCenter]
usingBlock: addObserverForName:UbiquityManagedStoreDidImportChangesNotification object:nil queue:nil usingBlock:
^(NSNotification *note) { ^(NSNotification *note) {
[self updateUsers]; [self updateUsers];
}]; }];
@ -237,10 +237,12 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
if (!(self.showItem.enabled = ![self.passwordWindow.window isVisible])) { if (!(self.showItem.enabled = ![self.passwordWindow.window isVisible])) {
self.showItem.title = @"Show (Showing)"; self.showItem.title = @"Show (Showing)";
self.showItem.toolTip = @"Master Password is already showing."; self.showItem.toolTip = @"Master Password is already showing.";
} else if (!(self.showItem.enabled = (self.activeUser != nil))) { }
else if (!(self.showItem.enabled = (self.activeUser != nil))) {
self.showItem.title = @"Show (No user)"; self.showItem.title = @"Show (No user)";
self.showItem.toolTip = @"First select the user to show passwords for."; self.showItem.toolTip = @"First select the user to show passwords for.";
} else { }
else {
self.showItem.title = @"Show"; self.showItem.title = @"Show";
self.showItem.toolTip = nil; self.showItem.toolTip = nil;
} }
@ -249,7 +251,8 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
self.lockItem.title = @"Lock"; self.lockItem.title = @"Lock";
self.lockItem.enabled = YES; self.lockItem.enabled = YES;
self.lockItem.toolTip = nil; self.lockItem.toolTip = nil;
} else { }
else {
self.lockItem.title = @"Lock (Locked)"; self.lockItem.title = @"Lock (Locked)";
self.lockItem.enabled = NO; self.lockItem.enabled = NO;
self.lockItem.toolTip = @"Master Password is currently locked."; self.lockItem.toolTip = @"Master Password is currently locked.";
@ -262,11 +265,13 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
self.savePasswordItem.title = @"Save Password (No user)"; self.savePasswordItem.title = @"Save Password (No user)";
self.savePasswordItem.enabled = NO; self.savePasswordItem.enabled = NO;
self.savePasswordItem.toolTip = @"First select your user and unlock by showing the Master Password window."; self.savePasswordItem.toolTip = @"First select your user and unlock by showing the Master Password window.";
} else if (!self.key) { }
else if (!self.key) {
self.savePasswordItem.title = @"Save Password (Locked)"; self.savePasswordItem.title = @"Save Password (Locked)";
self.savePasswordItem.enabled = NO; self.savePasswordItem.enabled = NO;
self.savePasswordItem.toolTip = @"First unlock by showing the Master Password window."; self.savePasswordItem.toolTip = @"First unlock by showing the Master Password window.";
} else { }
else {
self.savePasswordItem.title = @"Save Password"; self.savePasswordItem.title = @"Save Password";
self.savePasswordItem.enabled = YES; self.savePasswordItem.enabled = YES;
self.savePasswordItem.toolTip = nil; self.savePasswordItem.toolTip = nil;

16
MasterPassword/ObjC/Mac/MPPasswordWindowController.m
View File

@ -14,7 +14,6 @@
#define MPAlertUnlockMP @"MPAlertUnlockMP" #define MPAlertUnlockMP @"MPAlertUnlockMP"
#define MPAlertIncorrectMP @"MPAlertIncorrectMP" #define MPAlertIncorrectMP @"MPAlertIncorrectMP"
@interface MPPasswordWindowController() @interface MPPasswordWindowController()
@property(nonatomic, strong) NSArray /* MPElementEntity */ *siteResults; @property(nonatomic, strong) NSArray /* MPElementEntity */ *siteResults;
@ -49,18 +48,18 @@
[moc saveToStore]; [moc saveToStore];
}]; }];
} forKeyPath:@"key" options:NSKeyValueObservingOptionInitial context:nil]; } forKeyPath:@"key" options:NSKeyValueObservingOptionInitial context:nil];
[[NSNotificationCenter defaultCenter] addObserverForName:NSWindowDidBecomeKeyNotification object:self.window queue:nil [[NSNotificationCenter defaultCenter]
usingBlock:^(NSNotification *note) { addObserverForName:NSWindowDidBecomeKeyNotification object:self.window queue:nil usingBlock:^(NSNotification *note) {
if (!self.inProgress) if (!self.inProgress)
[self unlock]; [self unlock];
[self.siteField selectText:self]; [self.siteField selectText:self];
}]; }];
[[NSNotificationCenter defaultCenter] addObserverForName:NSWindowWillCloseNotification object:self.window queue:nil [[NSNotificationCenter defaultCenter]
usingBlock:^(NSNotification *note) { addObserverForName:NSWindowWillCloseNotification object:self.window queue:nil usingBlock:^(NSNotification *note) {
[[NSApplication sharedApplication] hide:self]; [[NSApplication sharedApplication] hide:self];
}]; }];
[[NSNotificationCenter defaultCenter] addObserverForName:MPSignedOutNotification object:nil queue:nil [[NSNotificationCenter defaultCenter]
usingBlock:^(NSNotification *note) { addObserverForName:MPSignedOutNotification object:nil queue:nil usingBlock:^(NSNotification *note) {
[self.window close]; [self.window close];
}]; }];
@ -91,7 +90,8 @@
NSAlert *alert = [NSAlert alertWithMessageText:@"Master Password is locked." NSAlert *alert = [NSAlert alertWithMessageText:@"Master Password is locked."
defaultButton:@"Unlock" alternateButton:@"Change" otherButton:@"Cancel" defaultButton:@"Unlock" alternateButton:@"Change" otherButton:@"Cancel"
informativeTextWithFormat:@"The master password is required to unlock the application for:\n\n%@", [MPAppDelegate get].activeUser.name]; informativeTextWithFormat:@"The master password is required to unlock the application for:\n\n%@",
[MPAppDelegate get].activeUser.name];
NSSecureTextField *passwordField = [[NSSecureTextField alloc] initWithFrame:NSMakeRect( 0, 0, 200, 22 )]; NSSecureTextField *passwordField = [[NSSecureTextField alloc] initWithFrame:NSMakeRect( 0, 0, 200, 22 )];
[alert setAccessoryView:passwordField]; [alert setAccessoryView:passwordField];
[alert layout]; [alert layout];

1
MasterPassword/ObjC/Mac/MasterPassword-Prefix.pch
View File

@ -4,7 +4,6 @@
#import "Pearl-Prefix.pch" #import "Pearl-Prefix.pch"
#ifdef __OBJC__ #ifdef __OBJC__
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>

2
MasterPassword/ObjC/Mac/main.m
View File

@ -6,8 +6,6 @@
// Copyright (c) 2012 Lyndir. All rights reserved. // Copyright (c) 2012 Lyndir. All rights reserved.
// //
#import <Cocoa/Cocoa.h>
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
return NSApplicationMain( argc, (const char **)argv ); return NSApplicationMain( argc, (const char **)argv );

9
MasterPassword/ObjC/MasterPassword.xcdatamodeld/MasterPassword 1.xcdatamodel/contents
View File

@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="1171" systemVersion="11E53" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic"> <model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0"
lastSavedToolsVersion="1171" systemVersion="11E53" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
<entity name="MPElementEntity" representedClassName="MPElementEntity" isAbstract="YES" syncable="YES"> <entity name="MPElementEntity" representedClassName="MPElementEntity" isAbstract="YES" syncable="YES">
<attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/> <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
<attribute name="lastUsed" attributeType="Date" syncable="YES"/> <attribute name="lastUsed" attributeType="Date" syncable="YES"/>
<attribute name="name" attributeType="String" minValueString="1" indexed="YES" syncable="YES"/> <attribute name="name" attributeType="String" minValueString="1" indexed="YES" syncable="YES"/>
<attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/> <attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
<attribute name="uses_" attributeType="Integer 16" defaultValueString="0" syncable="YES"/> <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
<relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements" inverseEntity="MPUserEntity" syncable="YES"/> <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements"
inverseEntity="MPUserEntity" syncable="YES"/>
</entity> </entity>
<entity name="MPElementGeneratedEntity" representedClassName="MPElementGeneratedEntity" parentEntity="MPElementEntity" syncable="YES"> <entity name="MPElementGeneratedEntity" representedClassName="MPElementGeneratedEntity" parentEntity="MPElementEntity" syncable="YES">
<attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/> <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
@ -21,7 +23,8 @@
<attribute name="lastUsed" optional="YES" attributeType="Date" syncable="YES"/> <attribute name="lastUsed" optional="YES" attributeType="Date" syncable="YES"/>
<attribute name="name" attributeType="String" syncable="YES"/> <attribute name="name" attributeType="String" syncable="YES"/>
<attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO"/> <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO"/>
<relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity" inverseName="user" inverseEntity="MPElementEntity" syncable="YES"/> <relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity"
inverseName="user" inverseEntity="MPElementEntity" syncable="YES"/>
</entity> </entity>
<elements> <elements>
<element name="MPElementEntity" positionX="160" positionY="192" width="128" height="135"/> <element name="MPElementEntity" positionX="160" positionY="192" width="128" height="135"/>

9
MasterPassword/ObjC/MasterPassword.xcdatamodeld/MasterPassword 2.xcdatamodel/contents
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="2057" systemVersion="12C60" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic"> <model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0"
lastSavedToolsVersion="2057" systemVersion="12C60" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
<entity name="MPElementEntity" representedClassName="MPElementEntity" isAbstract="YES" syncable="YES"> <entity name="MPElementEntity" representedClassName="MPElementEntity" isAbstract="YES" syncable="YES">
<attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/> <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
<attribute name="lastUsed" attributeType="Date" indexed="YES" syncable="YES"/> <attribute name="lastUsed" attributeType="Date" indexed="YES" syncable="YES"/>
@ -11,7 +12,8 @@
<attribute name="userName" optional="YES" attributeType="String" syncable="YES"/> <attribute name="userName" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="uses_" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/> <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/>
<attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" syncable="YES"/> <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" syncable="YES"/>
<relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements" inverseEntity="MPUserEntity" syncable="YES"/> <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements"
inverseEntity="MPUserEntity" syncable="YES"/>
</entity> </entity>
<entity name="MPElementGeneratedEntity" representedClassName="MPElementGeneratedEntity" parentEntity="MPElementEntity" syncable="YES"> <entity name="MPElementGeneratedEntity" representedClassName="MPElementGeneratedEntity" parentEntity="MPElementEntity" syncable="YES">
<attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/> <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
@ -29,7 +31,8 @@
<attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO"> <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO">
<userInfo/> <userInfo/>
</attribute> </attribute>
<relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity" inverseName="user" inverseEntity="MPElementEntity" syncable="YES"/> <relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity"
inverseName="user" inverseEntity="MPElementEntity" syncable="YES"/>
</entity> </entity>
<elements> <elements>
<element name="MPElementEntity" positionX="0" positionY="0" width="128" height="180"/> <element name="MPElementEntity" positionX="0" positionY="0" width="128" height="180"/>

9
MasterPassword/ObjC/MasterPassword.xcdatamodeld/MasterPassword 3.xcdatamodel/contents
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="1810" systemVersion="12B19" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic"> <model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0"
lastSavedToolsVersion="1810" systemVersion="12B19" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
<entity name="MPElementEntity" representedClassName="MPElementEntity" isAbstract="YES" syncable="YES"> <entity name="MPElementEntity" representedClassName="MPElementEntity" isAbstract="YES" syncable="YES">
<attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/> <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
<attribute name="lastUsed" attributeType="Date" indexed="YES" syncable="YES"/> <attribute name="lastUsed" attributeType="Date" indexed="YES" syncable="YES"/>
@ -11,7 +12,8 @@
<attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/> <attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
<attribute name="uses_" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/> <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/>
<attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" syncable="YES"/> <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" syncable="YES"/>
<relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements" inverseEntity="MPUserEntity" syncable="YES"/> <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements"
inverseEntity="MPUserEntity" syncable="YES"/>
</entity> </entity>
<entity name="MPElementGeneratedEntity" representedClassName="MPElementGeneratedEntity" parentEntity="MPElementEntity" syncable="YES"> <entity name="MPElementGeneratedEntity" representedClassName="MPElementGeneratedEntity" parentEntity="MPElementEntity" syncable="YES">
<attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/> <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
@ -29,7 +31,8 @@
<attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO"> <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO">
<userInfo/> <userInfo/>
</attribute> </attribute>
<relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity" inverseName="user" inverseEntity="MPElementEntity" syncable="YES"/> <relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity"
inverseName="user" inverseEntity="MPElementEntity" syncable="YES"/>
</entity> </entity>
<elements> <elements>
<element name="MPElementEntity" positionX="-0" positionY="-286" width="128" height="178"/> <element name="MPElementEntity" positionX="-0" positionY="-286" width="128" height="178"/>

9
MasterPassword/ObjC/MasterPassword.xcdatamodeld/MasterPassword 4.xcdatamodel/contents
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="2057" systemVersion="12C60" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic"> <model name="" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0"
lastSavedToolsVersion="2057" systemVersion="12C60" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
<entity name="MPElementEntity" representedClassName="MPElementEntity" isAbstract="YES" syncable="YES"> <entity name="MPElementEntity" representedClassName="MPElementEntity" isAbstract="YES" syncable="YES">
<attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/> <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
<attribute name="lastUsed" attributeType="Date" indexed="YES" syncable="YES"/> <attribute name="lastUsed" attributeType="Date" indexed="YES" syncable="YES"/>
@ -11,7 +12,8 @@
<attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/> <attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
<attribute name="uses_" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/> <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/>
<attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" syncable="YES"/> <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" syncable="YES"/>
<relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements" inverseEntity="MPUserEntity" syncable="YES"/> <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="elements"
inverseEntity="MPUserEntity" syncable="YES"/>
</entity> </entity>
<entity name="MPElementGeneratedEntity" representedClassName="MPElementGeneratedEntity" parentEntity="MPElementEntity" syncable="YES"> <entity name="MPElementGeneratedEntity" representedClassName="MPElementGeneratedEntity" parentEntity="MPElementEntity" syncable="YES">
<attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/> <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
@ -28,7 +30,8 @@
<attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO"> <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO">
<userInfo/> <userInfo/>
</attribute> </attribute>
<relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity" inverseName="user" inverseEntity="MPElementEntity" syncable="YES"/> <relationship name="elements" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPElementEntity"
inverseName="user" inverseEntity="MPElementEntity" syncable="YES"/>
</entity> </entity>
<elements> <elements>
<element name="MPElementEntity" positionX="-0" positionY="-286" width="128" height="178"/> <element name="MPElementEntity" positionX="-0" positionY="-286" width="128" height="178"/>

69
MasterPassword/ObjC/iOS/MPAppDelegate.m
View File

@ -18,7 +18,6 @@
@end @end
@implementation MPAppDelegate @implementation MPAppDelegate
+ (void)initialize { + (void)initialize {
@ -202,43 +201,47 @@
[[Crashlytics sharedInstance] setBoolValue:[[PearlConfig get].firstRun boolValue] forKey:@"firstRun"]; [[Crashlytics sharedInstance] setBoolValue:[[PearlConfig get].firstRun boolValue] forKey:@"firstRun"];
[[Crashlytics sharedInstance] setIntValue:[[PearlConfig get].launchCount intValue] forKey:@"launchCount"]; [[Crashlytics sharedInstance] setIntValue:[[PearlConfig get].launchCount intValue] forKey:@"launchCount"];
[[Crashlytics sharedInstance] setBoolValue:[[PearlConfig get].askForReviews boolValue] forKey:@"askForReviews"]; [[Crashlytics sharedInstance] setBoolValue:[[PearlConfig get].askForReviews boolValue] forKey:@"askForReviews"];
[[Crashlytics sharedInstance] setIntValue:[[PearlConfig get].reviewAfterLaunches intValue] forKey:@"reviewAfterLaunches"]; [[Crashlytics sharedInstance]
setIntValue:[[PearlConfig get].reviewAfterLaunches intValue] forKey:@"reviewAfterLaunches"];
[[Crashlytics sharedInstance] setObjectValue:[PearlConfig get].reviewedVersion forKey:@"reviewedVersion"]; [[Crashlytics sharedInstance] setObjectValue:[PearlConfig get].reviewedVersion forKey:@"reviewedVersion"];
#ifdef TESTFLIGHT_SDK_VERSION #ifdef TESTFLIGHT_SDK_VERSION
[TestFlight addCustomEnvironmentInformation:[[MPConfig get].rememberLogin boolValue]? @"YES": @"NO" forKey:@"rememberLogin"]; [TestFlight addCustomEnvironmentInformation:[@([[MPConfig get].rememberLogin boolValue]) description]
[TestFlight addCustomEnvironmentInformation:[self storeManager].cloudEnabled? @"YES": @"NO" forKey:@"iCloud"]; forKey:@"rememberLogin"];
[TestFlight addCustomEnvironmentInformation:[[MPConfig get].iCloudDecided boolValue]? @"YES": @"NO" forKey:@"iCloudDecided"]; [TestFlight addCustomEnvironmentInformation:[@([self storeManager].cloudEnabled) description] forKey:@"iCloud"];
[TestFlight addCustomEnvironmentInformation:[[MPiOSConfig get].sendInfo boolValue]? @"YES": @"NO" forKey:@"sendInfo"]; [TestFlight addCustomEnvironmentInformation:[@([[MPConfig get].iCloudDecided boolValue]) description]
[TestFlight addCustomEnvironmentInformation:[[MPiOSConfig get].helpHidden boolValue]? @"YES": @"NO" forKey:@"helpHidden"]; forKey:@"iCloudDecided"];
[TestFlight addCustomEnvironmentInformation:[[MPiOSConfig get].showSetup boolValue]? @"YES": @"NO" [TestFlight addCustomEnvironmentInformation:[@([[MPiOSConfig get].sendInfo boolValue]) description] forKey:@"sendInfo"];
[TestFlight addCustomEnvironmentInformation:[@([[MPiOSConfig get].helpHidden boolValue]) description]
forKey:@"helpHidden"];
[TestFlight addCustomEnvironmentInformation:[@([[MPiOSConfig get].showSetup boolValue]) description]
forKey:@"showQuickStart"]; forKey:@"showQuickStart"];
[TestFlight addCustomEnvironmentInformation:[[PearlConfig get].firstRun boolValue]? @"YES": @"NO" forKey:@"firstRun"]; [TestFlight addCustomEnvironmentInformation:[@([[PearlConfig get].firstRun boolValue]) description] forKey:@"firstRun"];
[TestFlight addCustomEnvironmentInformation:[[PearlConfig get].launchCount description] forKey:@"launchCount"]; [TestFlight addCustomEnvironmentInformation:[[PearlConfig get].launchCount description] forKey:@"launchCount"];
[TestFlight addCustomEnvironmentInformation:[[PearlConfig get].askForReviews boolValue]? @"YES": @"NO" [TestFlight addCustomEnvironmentInformation:[@([[PearlConfig get].askForReviews boolValue]) description]
forKey:@"askForReviews"]; forKey:@"askForReviews"];
[TestFlight addCustomEnvironmentInformation:[[PearlConfig get].reviewAfterLaunches description] forKey:@"reviewAfterLaunches"]; [TestFlight addCustomEnvironmentInformation:[[PearlConfig get].reviewAfterLaunches description]
forKey:@"reviewAfterLaunches"];
[TestFlight addCustomEnvironmentInformation:[PearlConfig get].reviewedVersion forKey:@"reviewedVersion"]; [TestFlight addCustomEnvironmentInformation:[PearlConfig get].reviewedVersion forKey:@"reviewedVersion"];
#endif #endif
MPCheckpoint( MPCheckpointConfig, @{ MPCheckpoint( MPCheckpointConfig, @{
@"rememberLogin" : [[MPConfig get].rememberLogin boolValue]? @"YES": @"NO", @"rememberLogin" : @([[MPConfig get].rememberLogin boolValue]),
@"iCloud" : [self storeManager].cloudEnabled? @"YES": @"NO", @"iCloud" : @([self storeManager].cloudEnabled),
@"iCloudDecided" : [[MPConfig get].iCloudDecided boolValue]? @"YES": @"NO", @"iCloudDecided" : @([[MPConfig get].iCloudDecided boolValue]),
@"sendInfo" : [[MPiOSConfig get].sendInfo boolValue]? @"YES": @"NO", @"sendInfo" : @([[MPiOSConfig get].sendInfo boolValue]),
@"helpHidden" : [[MPiOSConfig get].helpHidden boolValue]? @"YES": @"NO", @"helpHidden" : @([[MPiOSConfig get].helpHidden boolValue]),
@"showQuickStart" : [[MPiOSConfig get].showSetup boolValue]? @"YES": @"NO", @"showQuickStart" : @([[MPiOSConfig get].showSetup boolValue]),
@"firstRun" : [[PearlConfig get].firstRun boolValue]? @"YES": @"NO", @"firstRun" : @([[PearlConfig get].firstRun boolValue]),
@"launchCount" : NilToNSNull([[PearlConfig get].launchCount description]), @"launchCount" : NilToNSNull([[PearlConfig get].launchCount description]),
@"askForReviews" : [[PearlConfig get].askForReviews boolValue]? @"YES": @"NO", @"askForReviews" : @([[PearlConfig get].askForReviews boolValue]),
@"reviewAfterLaunches" : NilToNSNull([[PearlConfig get].reviewAfterLaunches description]), @"reviewAfterLaunches" : NilToNSNull([[PearlConfig get].reviewAfterLaunches description]),
@"reviewedVersion" : NilToNSNull([PearlConfig get].reviewedVersion) @"reviewedVersion" : NilToNSNull([PearlConfig get].reviewedVersion)
} ); } );
} }
}]; }];
[[NSNotificationCenter defaultCenter] addObserverForName:kIASKAppSettingChanged object:nil queue:nil [[NSNotificationCenter defaultCenter]
usingBlock:^(NSNotification *note) { addObserverForName:kIASKAppSettingChanged object:nil queue:nil usingBlock:^(NSNotification *note) {
[[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification [[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification object:note userInfo:nil];
object:note userInfo:nil];
}]; }];
#ifdef ADHOC #ifdef ADHOC
@ -411,8 +414,7 @@
- (void)applicationDidBecomeActive:(UIApplication *)application { - (void)applicationDidBecomeActive:(UIApplication *)application {
inf(@"Re-activated"); inf(@"Re-activated");
[[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification [[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification object:application userInfo:nil];
object:application userInfo:nil];
[[LocalyticsSession sharedLocalyticsSession] resume]; [[LocalyticsSession sharedLocalyticsSession] resume];
[[LocalyticsSession sharedLocalyticsSession] upload]; [[LocalyticsSession sharedLocalyticsSession] upload];
@ -460,8 +462,7 @@
initAlert:nil tappedButtonBlock:nil cancelTitle:[PearlStrings get].commonButtonOkay initAlert:nil tappedButtonBlock:nil cancelTitle:[PearlStrings get].commonButtonOkay
otherTitles:nil]; otherTitles:nil];
else else if (logs)
if (logs)
[PearlAlert showAlertWithTitle:@"Feedback" [PearlAlert showAlertWithTitle:@"Feedback"
message: message:
@"Have a question, comment, issue or just saying thanks?\n\n" @"Have a question, comment, issue or just saying thanks?\n\n"
@ -492,7 +493,9 @@
[PearlInfoPlist get].CFBundleVersion ) [PearlInfoPlist get].CFBundleVersion )
attachments:(logs attachments:(logs
? [[PearlEMailAttachment alloc] initWithContent:[[[PearlLogger get] formatMessagesWithLevel:logLevel] dataUsingEncoding:NSUTF8StringEncoding] ? [[PearlEMailAttachment alloc]
initWithContent:[[[PearlLogger get] formatMessagesWithLevel:logLevel]
dataUsingEncoding:NSUTF8StringEncoding]
mimeType:@"text/plain" mimeType:@"text/plain"
fileName:PearlString( @"%@-%@.log", fileName:PearlString( @"%@-%@.log",
[[NSDateFormatter rfc3339DateFormatter] stringFromDate:[NSDate date]], [[NSDateFormatter rfc3339DateFormatter] stringFromDate:[NSDate date]],
@ -566,7 +569,8 @@
[PearlEMail sendEMailTo:nil subject:@"Master Password Export" body:message [PearlEMail sendEMailTo:nil subject:@"Master Password Export" body:message
attachments:[[PearlEMailAttachment alloc] initWithContent:[exportedSites dataUsingEncoding:NSUTF8StringEncoding] attachments:[[PearlEMailAttachment alloc] initWithContent:[exportedSites dataUsingEncoding:NSUTF8StringEncoding]
mimeType:@"text/plain" fileName: mimeType:@"text/plain" fileName:
PearlString(@"%@ (%@).mpsites", [self activeUserForThread].name, [exportDateFormatter stringFromDate:[NSDate date]])], PearlString( @"%@ (%@).mpsites", [self activeUserForThread].name,
[exportDateFormatter stringFromDate:[NSDate date]] )],
nil]; nil];
} }
@ -603,8 +607,8 @@
- (void)didUpdateConfigForKey:(SEL)configKey fromValue:(id)value { - (void)didUpdateConfigForKey:(SEL)configKey fromValue:(id)value {
[[NSNotificationCenter defaultCenter] postNotificationName:MPCheckConfigNotification [[NSNotificationCenter defaultCenter]
object:NSStringFromSelector(configKey) userInfo:nil]; postNotificationName:MPCheckConfigNotification object:NSStringFromSelector( configKey ) userInfo:nil];
} }
#pragma mark - UbiquityStoreManagerDelegate #pragma mark - UbiquityStoreManagerDelegate
@ -621,8 +625,7 @@
[PearlAlert showAlertWithTitle:@"iCloud" message: [PearlAlert showAlertWithTitle:@"iCloud" message:
@"iCloud is now disabled.\n\n" @"iCloud is now disabled.\n\n"
@"It is highly recommended you enable iCloud." @"It is highly recommended you enable iCloud."
viewStyle:UIAlertViewStyleDefault initAlert:nil viewStyle:UIAlertViewStyleDefault initAlert:nil tappedButtonBlock:^(UIAlertView *alert, NSInteger buttonIndex) {
tappedButtonBlock:^(UIAlertView *alert, NSInteger buttonIndex) {
if (buttonIndex == [alert firstOtherButtonIndex] + 0) { if (buttonIndex == [alert firstOtherButtonIndex] + 0) {
[PearlAlert showAlertWithTitle:@"About iCloud" message: [PearlAlert showAlertWithTitle:@"About iCloud" message:
@"iCloud is Apple's solution for saving your data in \"the cloud\" " @"iCloud is Apple's solution for saving your data in \"the cloud\" "

1
MasterPassword/ObjC/iOS/MPAppViewController.h
View File

@ -17,7 +17,6 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
@interface MPAppViewController : UIViewController @interface MPAppViewController : UIViewController
- (IBAction)gorillas:(UIButton *)sender; - (IBAction)gorillas:(UIButton *)sender;

3
MasterPassword/ObjC/iOS/MPAppViewController.m
View File

@ -17,12 +17,9 @@
#import "MPAppViewController.h" #import "MPAppViewController.h"
@implementation MPAppViewController { @implementation MPAppViewController {
} }
- (IBAction)gorillas:(UIButton *)sender { - (IBAction)gorillas:(UIButton *)sender {
MPCheckpoint( MPCheckpointApp, @{ MPCheckpoint( MPCheckpointApp, @{

1
MasterPassword/ObjC/iOS/MPAppsViewController.h
View File

@ -17,7 +17,6 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
@interface MPAppsViewController : UIViewController<UIPageViewControllerDataSource, UIPageViewControllerDelegate> @interface MPAppsViewController : UIViewController<UIPageViewControllerDataSource, UIPageViewControllerDelegate>
@property(weak, nonatomic) IBOutlet UIImageView *pagePositionView; @property(weak, nonatomic) IBOutlet UIImageView *pagePositionView;

6
MasterPassword/ObjC/iOS/MPAppsViewController.m
View File

@ -17,23 +17,20 @@
#import "MPAppsViewController.h" #import "MPAppsViewController.h"
@interface MPAppsViewController() @interface MPAppsViewController()
@property(nonatomic, strong) NSMutableArray *pageVCs; @property(nonatomic, strong) NSMutableArray *pageVCs;
@property(nonatomic, strong) UIPageViewController *pageViewController; @property(nonatomic, strong) UIPageViewController *pageViewController;
@end @end
@implementation MPAppsViewController { @implementation MPAppsViewController {
} }
@synthesize pagePositionView = _pagePositionView; @synthesize pagePositionView = _pagePositionView;
@synthesize pageVCs = _pageVCs; @synthesize pageVCs = _pageVCs;
@synthesize pageViewController = _pageViewController; @synthesize pageViewController = _pageViewController;
- (void)viewDidLoad { - (void)viewDidLoad {
self.pageVCs = [NSMutableArray array]; self.pageVCs = [NSMutableArray array];
@ -101,7 +98,6 @@
return NO; return NO;
} }
- (UIViewController *)pageViewController:(UIPageViewController *)pageViewController - (UIViewController *)pageViewController:(UIPageViewController *)pageViewController
viewControllerBeforeViewController:(UIViewController *)viewController { viewControllerBeforeViewController:(UIViewController *)viewController {

1
MasterPassword/ObjC/iOS/MPElementListAllViewController.h
View File

@ -20,6 +20,7 @@
#import "MPElementListController.h" #import "MPElementListController.h"
@interface MPElementListAllViewController : MPElementListController @interface MPElementListAllViewController : MPElementListController
@property(weak, nonatomic) IBOutlet UINavigationBar *navigationBar; @property(weak, nonatomic) IBOutlet UINavigationBar *navigationBar;
- (IBAction)close:(id)sender; - (IBAction)close:(id)sender;

3
MasterPassword/ObjC/iOS/MPElementListAllViewController.m
View File

@ -132,8 +132,7 @@
message:PearlString( @"This upgrade has caused %d passwords to change.\n" message:PearlString( @"This upgrade has caused %d passwords to change.\n"
@"To make updating the actual passwords of these accounts easier, " @"To make updating the actual passwords of these accounts easier, "
@"you can email a summary of these changes to yourself.", [changes count] ) @"you can email a summary of these changes to yourself.", [changes count] )
viewStyle:UIAlertViewStyleDefault initAlert:nil viewStyle:UIAlertViewStyleDefault initAlert:nil tappedButtonBlock:^(UIAlertView *alert, NSInteger buttonIndex) {
tappedButtonBlock:^(UIAlertView *alert, NSInteger buttonIndex) {
if (buttonIndex == [alert cancelButtonIndex]) if (buttonIndex == [alert cancelButtonIndex])
return; return;

4
MasterPassword/ObjC/iOS/MPElementListController.m
View File

@ -140,7 +140,6 @@
} }
- (void)customTableViewUpdates { - (void)customTableViewUpdates {
} }
// See MP-14, also crashes easily on internal assertions etc.. // See MP-14, also crashes easily on internal assertions etc..
@ -226,7 +225,8 @@
element.uses, [self.dateFormatter stringFromDate:element.lastUsed], [element.algorithm shortNameOfType:element.type] ); element.uses, [self.dateFormatter stringFromDate:element.lastUsed], [element.algorithm shortNameOfType:element.type] );
} }
- (NSIndexPath *)tableIndexPathForFetchController:(NSFetchedResultsController *)fetchedResultsController indexPath:(NSIndexPath *)indexPath { - (NSIndexPath *)tableIndexPathForFetchController:(NSFetchedResultsController *)fetchedResultsController
indexPath:(NSIndexPath *)indexPath {
if (fetchedResultsController == self.fetchedResultsControllerByLastUsed) if (fetchedResultsController == self.fetchedResultsControllerByLastUsed)
return [NSIndexPath indexPathForRow:indexPath.row inSection:0]; return [NSIndexPath indexPathForRow:indexPath.row inSection:0];

5
MasterPassword/ObjC/iOS/MPElementListSearchController.m
View File

@ -17,6 +17,7 @@
@end @end
@implementation MPElementListSearchController @implementation MPElementListSearchController
@synthesize searchDisplayController; @synthesize searchDisplayController;
- (id)init { - (id)init {
@ -208,7 +209,8 @@
} }
// "New" section. // "New" section.
NSString *siteName = [self.searchDisplayController.searchBar.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]; NSString *siteName
= [self.searchDisplayController.searchBar.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
[PearlAlert showAlertWithTitle:@"New Site" [PearlAlert showAlertWithTitle:@"New Site"
message:PearlString( @"Do you want to create a new site named:\n%@", siteName ) message:PearlString( @"Do you want to create a new site named:\n%@", siteName )
@ -240,5 +242,4 @@ forRowAtIndexPath:(NSIndexPath *)indexPath {
[super tableView:tableView commitEditingStyle:editingStyle forRowAtIndexPath:indexPath]; [super tableView:tableView commitEditingStyle:editingStyle forRowAtIndexPath:indexPath];
} }
@end @end

1
MasterPassword/ObjC/iOS/MPMainViewController.h
View File

@ -49,7 +49,6 @@
@property(weak, nonatomic) IBOutlet UIImageView *pullUpView; @property(weak, nonatomic) IBOutlet UIImageView *pullUpView;
@property(weak, nonatomic) IBOutlet UIImageView *pullDownView; @property(weak, nonatomic) IBOutlet UIImageView *pullDownView;
@property(copy, nonatomic) void (^contentTipCleanup)(BOOL finished); @property(copy, nonatomic) void (^contentTipCleanup)(BOOL finished);
@property(copy, nonatomic) void (^toolTipCleanup)(BOOL finished); @property(copy, nonatomic) void (^toolTipCleanup)(BOOL finished);

33
MasterPassword/ObjC/iOS/MPMainViewController.m
View File

@ -11,8 +11,8 @@
#import "MPAppDelegate_Store.h" #import "MPAppDelegate_Store.h"
#import "MPElementListAllViewController.h" #import "MPElementListAllViewController.h"
@interface MPMainViewController() @interface MPMainViewController()
@property(nonatomic) BOOL suppressOutdatedAlert; @property(nonatomic) BOOL suppressOutdatedAlert;
@end @end
@ -43,7 +43,6 @@
[self updateUserHiddenAnimated:NO]; [self updateUserHiddenAnimated:NO];
} }
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
if ([[segue identifier] isEqualToString:@"MP_ChooseType"]) if ([[segue identifier] isEqualToString:@"MP_ChooseType"])
@ -78,8 +77,8 @@
self.alertBody.text = nil; self.alertBody.text = nil;
self.toolTipEditIcon.hidden = YES; self.toolTipEditIcon.hidden = YES;
[[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidEnterBackgroundNotification object:self queue:nil [[NSNotificationCenter defaultCenter]
usingBlock:^(NSNotification *note) { addObserverForName:UIApplicationDidEnterBackgroundNotification object:self queue:nil usingBlock:^(NSNotification *note) {
self.suppressOutdatedAlert = NO; self.suppressOutdatedAlert = NO;
}]; }];
[[NSNotificationCenter defaultCenter] addObserverForName:MPElementUpdatedNotification object:nil queue:nil usingBlock: [[NSNotificationCenter defaultCenter] addObserverForName:MPElementUpdatedNotification object:nil queue:nil usingBlock:
@ -216,8 +215,8 @@
if (activeElement.type & MPElementTypeClassGenerated) { if (activeElement.type & MPElementTypeClassGenerated) {
self.passwordCounter.alpha = 0.5f; self.passwordCounter.alpha = 0.5f;
self.passwordIncrementer.alpha = 0.5f; self.passwordIncrementer.alpha = 0.5f;
} else }
if (activeElement.type & MPElementTypeClassStored) else if (activeElement.type & MPElementTypeClassStored)
self.passwordEdit.alpha = 0.5f; self.passwordEdit.alpha = 0.5f;
} }
@ -273,7 +272,8 @@
if ([[MPiOSConfig get].helpHidden boolValue]) { if ([[MPiOSConfig get].helpHidden boolValue]) {
self.contentContainer.frame = CGRectSetHeight( self.contentContainer.frame, self.view.bounds.size.height - 44 /* search bar */); self.contentContainer.frame = CGRectSetHeight( self.contentContainer.frame, self.view.bounds.size.height - 44 /* search bar */);
self.helpContainer.frame = CGRectSetY( self.helpContainer.frame, self.view.bounds.size.height - 20 /* pull-up */); self.helpContainer.frame = CGRectSetY( self.helpContainer.frame, self.view.bounds.size.height - 20 /* pull-up */);
} else { }
else {
self.contentContainer.frame = CGRectSetHeight( self.contentContainer.frame, 225 ); self.contentContainer.frame = CGRectSetHeight( self.contentContainer.frame, 225 );
[self.helpContainer setFrameFromCurrentSizeAndParentPaddingTop:CGFLOAT_MAX right:0 bottom:0 left:0]; [self.helpContainer setFrameFromCurrentSizeAndParentPaddingTop:CGFLOAT_MAX right:0 bottom:0 left:0];
} }
@ -302,10 +302,10 @@
if (self.siteInfoHidden) { if (self.siteInfoHidden) {
self.displayContainer.frame = CGRectSetHeight( self.displayContainer.frame, 87 ); self.displayContainer.frame = CGRectSetHeight( self.displayContainer.frame, 87 );
} else { }
else {
self.displayContainer.frame = CGRectSetHeight( self.displayContainer.frame, 137 ); self.displayContainer.frame = CGRectSetHeight( self.displayContainer.frame, 137 );
} }
} }
- (void)setHelpChapter:(NSString *)chapter { - (void)setHelpChapter:(NSString *)chapter {
@ -531,8 +531,8 @@
// Not of a type that supports a password counter. // Not of a type that supports a password counter.
err(@"Cannot reset password counter: Element is not generated: %@", activeElement.name); err(@"Cannot reset password counter: Element is not generated: %@", activeElement.name);
return; return;
} else }
if (((MPElementGeneratedEntity *)activeElement).counter == 1) else if (((MPElementGeneratedEntity *)activeElement).counter == 1)
// Counter has initial value, no point resetting. // Counter has initial value, no point resetting.
return; return;
@ -625,7 +625,6 @@
return activeElement; return activeElement;
} }
- (IBAction)editPassword { - (IBAction)editPassword {
MPElementEntity *activeElement = [self activeElementForThread]; MPElementEntity *activeElement = [self activeElementForThread];
@ -778,7 +777,8 @@
do:^BOOL(MPElementEntity *activeElement) { do:^BOOL(MPElementEntity *activeElement) {
if ([activeElement.algorithm classOfType:type] != activeElement.typeClass) { if ([activeElement.algorithm classOfType:type] != activeElement.typeClass) {
// Type requires a different class of element. Recreate the element. // Type requires a different class of element. Recreate the element.
MPElementEntity *newElement = [NSEntityDescription insertNewObjectForEntityForName:[activeElement.algorithm classNameOfType:type] MPElementEntity *newElement
= [NSEntityDescription insertNewObjectForEntityForName:[activeElement.algorithm classNameOfType:type]
inManagedObjectContext:activeElement.managedObjectContext]; inManagedObjectContext:activeElement.managedObjectContext];
newElement.name = activeElement.name; newElement.name = activeElement.name;
newElement.user = activeElement.user; newElement.user = activeElement.user;
@ -793,8 +793,8 @@
} }
activeElement.type = type; activeElement.type = type;
[[NSNotificationCenter defaultCenter] postNotificationName:MPElementUpdatedNotification [[NSNotificationCenter defaultCenter]
object:activeElement.objectID]; postNotificationName:MPElementUpdatedNotification object:activeElement.objectID];
return YES; return YES;
}]; }];
} }
@ -866,7 +866,8 @@
// Not of a type whose content can be edited. // Not of a type whose content can be edited.
err(@"Cannot update element content: Element is not stored: %@", activeElement.name); err(@"Cannot update element content: Element is not stored: %@", activeElement.name);
return; return;
} else if ([((MPElementStoredEntity *)activeElement).content isEqual:self.contentField.text]) }
else if ([((MPElementStoredEntity *)activeElement).content isEqual:self.contentField.text])
// Content hasn't changed. // Content hasn't changed.
return; return;

6
MasterPassword/ObjC/iOS/MPPreferencesViewController.m
View File

@ -64,7 +64,8 @@
[self.avatarsView autoSizeContent]; [self.avatarsView autoSizeContent];
[self.avatarsView enumerateSubviews:^(UIView *subview, BOOL *stop, BOOL *recurse) { [self.avatarsView enumerateSubviews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
if (subview.tag && ((UIControl *)subview).selected) { if (subview.tag && ((UIControl *)subview).selected) {
[self.avatarsView setContentOffset:CGPointMake(subview.center.x - self.avatarsView.bounds.size.width / 2, 0) animated:animated]; [self.avatarsView setContentOffset:CGPointMake( subview.center.x - self.avatarsView.bounds.size.width / 2, 0 )
animated:animated];
} }
} recurse:NO]; } recurse:NO];
@ -112,8 +113,7 @@
if (cell == self.exportCell) if (cell == self.exportCell)
[[MPAppDelegate get] export]; [[MPAppDelegate get] export];
else else if (cell == self.changeMPCell) {
if (cell == self.changeMPCell) {
MPUserEntity *activeUser = [[MPAppDelegate get] activeUserForThread]; MPUserEntity *activeUser = [[MPAppDelegate get] activeUserForThread];
[[MPAppDelegate get] changeMasterPasswordFor:activeUser inContext:activeUser.managedObjectContext didResetBlock:nil]; [[MPAppDelegate get] changeMasterPasswordFor:activeUser inContext:activeUser.managedObjectContext didResetBlock:nil];
} }

1
MasterPassword/ObjC/iOS/MPTypeViewController.h
View File

@ -10,7 +10,6 @@
#import "MPEntities.h" #import "MPEntities.h"
@protocol MPTypeDelegate<NSObject> @protocol MPTypeDelegate<NSObject>
@required @required

2
MasterPassword/ObjC/iOS/MPTypeViewController.m
View File

@ -9,8 +9,6 @@
#import "MPTypeViewController.h" #import "MPTypeViewController.h"
#import "MPAppDelegate.h" #import "MPAppDelegate.h"
#import "MPAppDelegate_Store.h" #import "MPAppDelegate_Store.h"
#import "MPAppDelegate_Key.h"
@interface MPTypeViewController() @interface MPTypeViewController()

48
MasterPassword/ObjC/iOS/MPUnlockViewController.m
View File

@ -143,8 +143,10 @@
} forControlEvents:UIControlEventValueChanged]; } forControlEvents:UIControlEventValueChanged];
self.emergencyContentTipContainer.alpha = 0; self.emergencyContentTipContainer.alpha = 0;
self.emergencyContentTipContainer.hidden = NO; self.emergencyContentTipContainer.hidden = NO;
self.marqueeTipTexts = @[ @"Tap and hold to delete or reset user.", self.marqueeTipTexts = @[
@"Shake for emergency generator." ]; @"Tap and hold to delete or reset user.",
@"Shake for emergency generator."
];
NSMutableArray *wordListLines = [NSMutableArray arrayWithCapacity:27413]; NSMutableArray *wordListLines = [NSMutableArray arrayWithCapacity:27413];
[[[NSString alloc] initWithData:[NSData dataWithContentsOfURL:[[NSBundle mainBundle] URLForResource:@"dictionary" withExtension:@"lst"]] [[[NSString alloc] initWithData:[NSData dataWithContentsOfURL:[[NSBundle mainBundle] URLForResource:@"dictionary" withExtension:@"lst"]]
@ -160,21 +162,21 @@
[self initializeWordLabel:wordLabel]; [self initializeWordLabel:wordLabel];
} recurse:NO]; } recurse:NO];
[[NSNotificationCenter defaultCenter] addObserverForName:UbiquityManagedStoreDidChangeNotification object:nil queue:nil [[NSNotificationCenter defaultCenter]
usingBlock:^(NSNotification *note) { addObserverForName:UbiquityManagedStoreDidChangeNotification object:nil queue:nil usingBlock:^(NSNotification *note) {
[self updateUsers]; [self updateUsers];
}]; }];
[[NSNotificationCenter defaultCenter] addObserverForName:UbiquityManagedStoreDidImportChangesNotification object:nil queue:nil [[NSNotificationCenter defaultCenter]
usingBlock:^(NSNotification *note) { addObserverForName:UbiquityManagedStoreDidImportChangesNotification object:nil queue:nil usingBlock:^(NSNotification *note) {
[self updateUsers]; [self updateUsers];
}]; }];
[[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationWillResignActiveNotification object:nil queue:nil [[NSNotificationCenter defaultCenter]
usingBlock:^(NSNotification *note) { addObserverForName:UIApplicationWillResignActiveNotification object:nil queue:nil usingBlock:^(NSNotification *note) {
[self emergencyCloseAnimated:NO]; [self emergencyCloseAnimated:NO];
self.uiContainer.alpha = 0; self.uiContainer.alpha = 0;
}]; }];
[[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidBecomeActiveNotification object:nil queue:nil [[NSNotificationCenter defaultCenter]
usingBlock:^(NSNotification *note) { addObserverForName:UIApplicationDidBecomeActiveNotification object:nil queue:nil usingBlock:^(NSNotification *note) {
[self updateLayoutAnimated:NO allowScroll:NO completion:nil]; [self updateLayoutAnimated:NO allowScroll:NO completion:nil];
[UIView animateWithDuration:1 animations:^{ [UIView animateWithDuration:1 animations:^{
self.uiContainer.alpha = 1; self.uiContainer.alpha = 1;
@ -257,6 +259,7 @@
} }
- (void)marqueeTip { - (void)marqueeTip {
[UIView animateWithDuration:0.5 animations:^{ [UIView animateWithDuration:0.5 animations:^{
self.tip.alpha = 0; self.tip.alpha = 0;
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
@ -331,7 +334,8 @@
if (!selected) { if (!selected) {
self.selectedUser = nil; self.selectedUser = nil;
[self didToggleUserSelection]; [self didToggleUserSelection];
} else if ((self.selectedUser = user)) }
else if ((self.selectedUser = user))
[self didToggleUserSelection]; [self didToggleUserSelection];
else else
[self didSelectNewUserAvatar:avatar]; [self didSelectNewUserAvatar:avatar];
@ -352,8 +356,7 @@
MPUserEntity *selectedUser = self.selectedUser; MPUserEntity *selectedUser = self.selectedUser;
if (!selectedUser) if (!selectedUser)
[self.passwordField resignFirstResponder]; [self.passwordField resignFirstResponder];
else else if ([[MPAppDelegate get] signInAsUser:selectedUser usingMasterPassword:nil]) {
if ([[MPAppDelegate get] signInAsUser:selectedUser usingMasterPassword:nil]) {
[self performSegueWithIdentifier:@"MP_Unlock" sender:self]; [self performSegueWithIdentifier:@"MP_Unlock" sender:self];
return; return;
} }
@ -367,7 +370,8 @@
- (void)didSelectNewUserAvatar:(UIButton *)newUserAvatar { - (void)didSelectNewUserAvatar:(UIButton *)newUserAvatar {
[MPAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) { [MPAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) {
MPUserEntity *newUser = [NSEntityDescription insertNewObjectForEntityForName:NSStringFromClass([MPUserEntity class]) inManagedObjectContext:moc]; MPUserEntity *newUser = [NSEntityDescription insertNewObjectForEntityForName:NSStringFromClass( [MPUserEntity class] )
inManagedObjectContext:moc];
[self showNewUserNameAlertFor:newUser inContext:moc completion:^(BOOL finished) { [self showNewUserNameAlertFor:newUser inContext:moc completion:^(BOOL finished) {
newUserAvatar.selected = NO; newUserAvatar.selected = NO;
@ -481,8 +485,8 @@
self.nameLabel.backgroundColor = [UIColor blackColor]; self.nameLabel.backgroundColor = [UIColor blackColor];
self.oldNameLabel.center = self.nameLabel.center; self.oldNameLabel.center = self.nameLabel.center;
self.avatarShadowColor = [UIColor whiteColor]; self.avatarShadowColor = [UIColor whiteColor];
} else }
if (!self.selectedUser && self.passwordView.alpha == 1) { else if (!self.selectedUser && self.passwordView.alpha == 1) {
// User was just deselected. // User was just deselected.
self.passwordField.text = nil; self.passwordField.text = nil;
self.passwordView.alpha = 0; self.passwordView.alpha = 0;
@ -501,7 +505,8 @@
self.wordWall.alpha = 0; self.wordWall.alpha = 0;
self.createPasswordTipView.alpha = 0; self.createPasswordTipView.alpha = 0;
self.wordWallAnimating = NO; self.wordWallAnimating = NO;
} else { }
else {
self.passwordFieldLabel.text = @"Create your master password:"; self.passwordFieldLabel.text = @"Create your master password:";
if (!self.wordWallAnimating) { if (!self.wordWallAnimating) {
@ -676,7 +681,8 @@
rotate.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear]; rotate.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear];
rotate.fromValue = [NSNumber numberWithFloat:0]; rotate.fromValue = [NSNumber numberWithFloat:0];
rotate.repeatCount = MAXFLOAT; rotate.repeatCount = MAXFLOAT;
} else { }
else {
rotate.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut]; rotate.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseOut];
rotate.repeatCount = 1; rotate.repeatCount = 1;
} }
@ -725,7 +731,8 @@
[avatar.layer removeAnimationForKey:@"inactiveShadow"]; [avatar.layer removeAnimationForKey:@"inactiveShadow"];
[avatar.layer addAnimation:group forKey:@"targetedShadow"]; [avatar.layer addAnimation:group forKey:@"targetedShadow"];
} }
} else { }
else {
if ([avatar.layer animationForKey:@"targetedShadow"]) { if ([avatar.layer animationForKey:@"targetedShadow"]) {
CABasicAnimation *toShadowColorAnimation = [CABasicAnimation animationWithKeyPath:@"shadowColor"]; CABasicAnimation *toShadowColorAnimation = [CABasicAnimation animationWithKeyPath:@"shadowColor"];
toShadowColorAnimation.toValue = (__bridge id)[UIColor blackColor].CGColor; toShadowColorAnimation.toValue = (__bridge id)[UIColor blackColor].CGColor;
@ -1079,7 +1086,8 @@
@"simplytweet:?link=http://twitter.com/%@", // SimplyTweet @"simplytweet:?link=http://twitter.com/%@", // SimplyTweet
@"icebird://user?screen_name=%@", // IceBird @"icebird://user?screen_name=%@", // IceBird
@"fluttr://user/%@", // Fluttr @"fluttr://user/%@", // Fluttr
@"http://twitter.com/%@"]) { @"http://twitter.com/%@"
]) {
NSURL *url = [NSURL URLWithString:PearlString( candidate, @"master_password" )]; NSURL *url = [NSURL URLWithString:PearlString( candidate, @"master_password" )];
if ([application canOpenURL:url]) { if ([application canOpenURL:url]) {

7
MasterPassword/ObjC/iOS/MPiOSConfig.m
View File

@ -7,6 +7,7 @@
// //
@implementation MPiOSConfig @implementation MPiOSConfig
@dynamic sendInfo, helpHidden, siteInfoHidden, showSetup, actionsTipShown, typeTipShown, loginNameTipShown; @dynamic sendInfo, helpHidden, siteInfoHidden, showSetup, actionsTipShown, typeTipShown, loginNameTipShown;
- (id)init { - (id)init {
@ -14,13 +15,15 @@
if (!(self = [super init])) if (!(self = [super init]))
return self; return self;
[self.defaults registerDefaults:@{ NSStringFromSelector(@selector(helpHidden)): @NO, [self.defaults registerDefaults:@{
NSStringFromSelector( @selector(helpHidden) ) : @NO,
NSStringFromSelector( @selector(siteInfoHidden) ) : @YES, NSStringFromSelector( @selector(siteInfoHidden) ) : @YES,
NSStringFromSelector( @selector(showSetup) ) : @YES, NSStringFromSelector( @selector(showSetup) ) : @YES,
NSStringFromSelector( @selector(iTunesID) ) : @"510296984", NSStringFromSelector( @selector(iTunesID) ) : @"510296984",
NSStringFromSelector( @selector(actionsTipShown) ) : PearlBoolNot(self.firstRun), NSStringFromSelector( @selector(actionsTipShown) ) : PearlBoolNot(self.firstRun),
NSStringFromSelector( @selector(typeTipShown) ) : PearlBoolNot(self.firstRun), NSStringFromSelector( @selector(typeTipShown) ) : PearlBoolNot(self.firstRun),
NSStringFromSelector(@selector(loginNameTipShown)): PearlBool(NO)}]; NSStringFromSelector( @selector(loginNameTipShown) ) : PearlBool(NO)
}];
return self; return self;
} }

12
MasterPassword/ObjC/iOS/Settings.bundle/Root.plist
View File

@ -6,7 +6,9 @@
<array> <array>
<dict> <dict>
<key>FooterText</key> <key>FooterText</key>
<string>If you&apos;re experiencing problems, enabling this will send us details that can help diagnose and resolve them. You will remain completely anonymous amongst the other thousands of users. No sensitive information is ever sent.</string> <string>If you&apos;re experiencing problems, enabling this will send us details that can help diagnose and resolve them.
You will remain completely anonymous amongst the other thousands of users. No sensitive information is ever sent.
</string>
<key>Title</key> <key>Title</key>
<string></string> <string></string>
<key>Type</key> <key>Type</key>
@ -54,7 +56,9 @@
</dict> </dict>
<dict> <dict>
<key>FooterText</key> <key>FooterText</key>
<string>When enabled, closing the application will not log out the user. Similar to your phone&apos;s SIM lock, you only need to log in once after powering on.</string> <string>When enabled, closing the application will not log out the user. Similar to your phone&apos;s SIM lock, you only
need to log in once after powering on.
</string>
<key>Title</key> <key>Title</key>
<string>Master Password</string> <string>Master Password</string>
<key>Type</key> <key>Type</key>
@ -76,7 +80,9 @@
<key>Title</key> <key>Title</key>
<string></string> <string></string>
<key>FooterText</key> <key>FooterText</key>
<string>Makes your sites available to all your Apple devices. This also works as a way of automatically keeping a back-up of your sites. Apple cannot see any of your passwords.</string> <string>Makes your sites available to all your Apple devices. This also works as a way of automatically keeping a back-up of
your sites. Apple cannot see any of your passwords.
</string>
</dict> </dict>
<dict> <dict>
<key>Type</key> <key>Type</key>