diff --git a/External/Pearl b/External/Pearl
index ad9ed240..e93f7c40 160000
--- a/External/Pearl
+++ b/External/Pearl
@@ -1 +1 @@
-Subproject commit ad9ed24071be86d9e1b2c577beba36a08e602637
+Subproject commit e93f7c406b157df3a4538becd2bff8b9ee7b0be8
diff --git a/MasterPassword/iOS/MPPreferencesViewController.h b/MasterPassword/iOS/MPPreferencesViewController.h
index e9b0fc3b..b88ccd78 100644
--- a/MasterPassword/iOS/MPPreferencesViewController.h
+++ b/MasterPassword/iOS/MPPreferencesViewController.h
@@ -18,5 +18,6 @@
@property (weak, nonatomic) IBOutlet UITableViewCell *changeMPCell;
- (IBAction)didToggleSwitch:(UISwitch *)sender;
+- (IBAction)settings:(id)sender;
@end
diff --git a/MasterPassword/iOS/MPPreferencesViewController.m b/MasterPassword/iOS/MPPreferencesViewController.m
index 5be9aff6..235d5315 100644
--- a/MasterPassword/iOS/MPPreferencesViewController.m
+++ b/MasterPassword/iOS/MPPreferencesViewController.m
@@ -123,4 +123,9 @@
[[MPAppDelegate get] forgetSavedKeyFor:[MPAppDelegate get].activeUser];
}
+- (IBAction)settings:(UIBarButtonItem *)sender {
+
+ [self.navigationController pushViewController:[IASKAppSettingsViewController new] animated:YES];
+}
+
@end
diff --git a/MasterPassword/iOS/MPUnlockViewController.m b/MasterPassword/iOS/MPUnlockViewController.m
index f33cbd3c..102c71f0 100644
--- a/MasterPassword/iOS/MPUnlockViewController.m
+++ b/MasterPassword/iOS/MPUnlockViewController.m
@@ -192,8 +192,10 @@
[self didToggleUserSelection];
else
[self didSelectNewUserAvatar:avatar];
- } else
+ } else {
+ self.selectedUser = nil;
[self didToggleUserSelection];
+ }
} options:0];
[self.avatarToUser setObject:NilToNSNull(user) forKey:[NSValue valueWithNonretainedObject:avatar]];
@@ -210,7 +212,7 @@
[self.passwordField resignFirstResponder];
else
if ([[MPAppDelegate get] signInAsUser:self.selectedUser usingMasterPassword:nil]) {
- [self performSegueWithIdentifier:@"MP_Unlock_Dismiss" sender:self];
+ [self dismissViewControllerAnimated:YES completion:nil];
return;
}
@@ -352,7 +354,7 @@
dispatch_async(dispatch_get_main_queue(), ^{
if (unlocked) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (long)(NSEC_PER_SEC * 0.5f)), dispatch_get_main_queue(), ^{
- [self performSegueWithIdentifier:@"MP_Unlock_Dismiss" sender:self];
+ [self dismissViewControllerAnimated:YES completion:nil];
});
} else
if (self.passwordField.text.length)
diff --git a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
index 7cacd1cd..9db68ed5 100644
--- a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
+++ b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
@@ -925,21 +925,12 @@ L4m3P4sSw0rD
+
-
-
-
-
-
-
-
-
-
-
@@ -1197,7 +1188,7 @@ L4m3P4sSw0rD
-
+
@@ -1244,13 +1235,6 @@ L4m3P4sSw0rD
-
-
-
-
-
-
-
@@ -1292,6 +1276,7 @@ L4m3P4sSw0rD
+
diff --git a/Site/img/frontpage_phone.png b/Site/img/frontpage_phone.png
index af93be7a..b22aa917 100644
Binary files a/Site/img/frontpage_phone.png and b/Site/img/frontpage_phone.png differ