From 21968f4ba62b1f73acf1106f599f40a8316b4ce6 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Sat, 23 May 2020 12:35:55 -0400 Subject: [PATCH] Fix messages for password reset. --- platform-darwin/Source/MPAppDelegate_Key.m | 4 ++-- platform-darwin/Source/iOS/MPiOSAppDelegate.m | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform-darwin/Source/MPAppDelegate_Key.m b/platform-darwin/Source/MPAppDelegate_Key.m index 3989e567..3b032dfc 100644 --- a/platform-darwin/Source/MPAppDelegate_Key.m +++ b/platform-darwin/Source/MPAppDelegate_Key.m @@ -249,14 +249,14 @@ masterPassword = PearlAwait( ^(void (^setResult)(id)) { PearlMainQueue( ^{ UIAlertController *controller = [UIAlertController alertControllerWithTitle:@"Enter Old Master Password" message: - strf( @"Your old master password is required to migrate the stored password for %@", site.name ) + strf( @"Your old master password is required to unlock the stored password for %@", site.name ) preferredStyle:UIAlertControllerStyleAlert]; [controller addTextFieldWithConfigurationHandler:nil]; [controller addAction:[UIAlertAction actionWithTitle:@"Migrate" style:UIAlertActionStyleDefault handler: ^(UIAlertAction *_Nonnull action) { setResult( controller.textFields.firstObject.text ); }]]; - [controller addAction:[UIAlertAction actionWithTitle:@"Don't Migrate" style:UIAlertActionStyleCancel handler: + [controller addAction:[UIAlertAction actionWithTitle:@"Leave It" style:UIAlertActionStyleCancel handler: ^(UIAlertAction *_Nonnull action) { setResult( nil ); }]]; diff --git a/platform-darwin/Source/iOS/MPiOSAppDelegate.m b/platform-darwin/Source/iOS/MPiOSAppDelegate.m index a45af0f4..9602303a 100644 --- a/platform-darwin/Source/iOS/MPiOSAppDelegate.m +++ b/platform-darwin/Source/iOS/MPiOSAppDelegate.m @@ -782,7 +782,7 @@ @"Changing your master password will cause all your generated passwords to change!\n" @"Changing the master password back to the old one will cause your passwords to revert as well." preferredStyle:UIAlertControllerStyleAlert]; - [alert addAction:[UIAlertAction actionWithTitle:@"Abort" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { + [alert addAction:[UIAlertAction actionWithTitle:@"Continue" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { [moc performBlockAndWait:^{ inf( @"Clearing keyID for user: %@.", user.userID ); user.keyID = nil;