diff --git a/External/Pearl b/External/Pearl index 01f6c675..ee96e89b 160000 --- a/External/Pearl +++ b/External/Pearl @@ -1 +1 @@ -Subproject commit 01f6c675598757a26df6e61c63d476708e1d038b +Subproject commit ee96e89bfecf584805fb5f295e2395fbb1e4186d diff --git a/MasterPassword/MPAppDelegate_Key.h b/MasterPassword/MPAppDelegate_Key.h index d11a0d4b..23769236 100644 --- a/MasterPassword/MPAppDelegate_Key.h +++ b/MasterPassword/MPAppDelegate_Key.h @@ -11,7 +11,7 @@ @interface MPAppDelegate_Shared (Key) - (BOOL)signInAsUser:(MPUserEntity *)user usingMasterPassword:(NSString *)password; -- (void)signOut; +- (void)signOutAnimated:(BOOL)animated; - (void)storeSavedKeyFor:(MPUserEntity *)user; - (void)forgetSavedKeyFor:(MPUserEntity *)user; diff --git a/MasterPassword/MPAppDelegate_Key.m b/MasterPassword/MPAppDelegate_Key.m index 195c184b..8e3b8b43 100644 --- a/MasterPassword/MPAppDelegate_Key.m +++ b/MasterPassword/MPAppDelegate_Key.m @@ -73,14 +73,15 @@ static NSDictionary *keyQuery(MPUserEntity *user) { } } -- (void)signOut { +- (void)signOutAnimated:(BOOL)animated { if (self.key) self.key = nil; if (self.activeUser) { self.activeUser = nil; - [[NSNotificationCenter defaultCenter] postNotificationName:MPNotificationSignedOut object:self]; + [[NSNotificationCenter defaultCenter] postNotificationName:MPNotificationSignedOut object:self userInfo: + [NSDictionary dictionaryWithObject:PearlBool(animated) forKey:@"animated"]]; } } diff --git a/MasterPassword/iOS/MPAppDelegate.m b/MasterPassword/iOS/MPAppDelegate.m index 218c9d30..92cec731 100644 --- a/MasterPassword/iOS/MPAppDelegate.m +++ b/MasterPassword/iOS/MPAppDelegate.m @@ -182,7 +182,11 @@ [[NSNotificationCenter defaultCenter] addObserverForName:MPNotificationSignedOut object:nil queue:nil usingBlock:^(NSNotification *note) { - [self.navigationController performSegueWithIdentifier:@"MP_Unlock" sender:nil]; + if ([[note.userInfo objectForKey:@"animated"] boolValue]) + [self.navigationController performSegueWithIdentifier:@"MP_Unlock" sender:nil]; + else + [self.navigationController presentViewController:[self.navigationController.storyboard instantiateViewControllerWithIdentifier:@"MPUnlockViewController"] + animated:NO completion:nil]; }]; [[NSNotificationCenter defaultCenter] addObserverForName:kIASKAppSettingChanged object:nil queue:nil usingBlock:^(NSNotification *note) { @@ -325,7 +329,7 @@ [self saveContext]; if (![[MPiOSConfig get].rememberLogin boolValue]) - [self signOut]; + [self signOutAnimated:NO]; [TestFlight passCheckpoint:MPCheckpointDeactivated]; } @@ -487,7 +491,7 @@ inf(@"Unsetting master password for: %@.", user.userID); user.keyID = nil; [self forgetSavedKeyFor:user]; - [self signOut]; + [self signOutAnimated:YES]; [TestFlight passCheckpoint:MPCheckpointChangeMP]; [[LocalyticsSession sharedLocalyticsSession] tagEvent:MPCheckpointChangeMP diff --git a/MasterPassword/iOS/MPMainViewController.m b/MasterPassword/iOS/MPMainViewController.m index 220fcdcf..27909fec 100644 --- a/MasterPassword/iOS/MPMainViewController.m +++ b/MasterPassword/iOS/MPMainViewController.m @@ -512,7 +512,7 @@ #endif { inf(@"Action: Sign out"); - [[MPAppDelegate get] signOut]; + [[MPAppDelegate get] signOutAnimated:YES]; break; } } diff --git a/Site/index.html b/Site/index.html index 500e8649..b88e6b28 100644 --- a/Site/index.html +++ b/Site/index.html @@ -9,25 +9,11 @@ - + - - - + + + + + + + + + + + + @@ -94,6 +103,23 @@
+
+ +
+
+ + + + +
+
+
+ This is an example of a HTML caption with a link. +
+ +
+
+

Master Password is different from other vault-like password solutions. It helps you set secure passwords for your sites, and at the same time makes losing your passwords almost impossible.