skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fix messages for password reset.

Browse Source
This commit is contained in:
Maarten Billemont 2020-05-23 12:35:55 -04:00
parent 8582c934c2
commit 21968f4ba6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform-darwin/Source/MPAppDelegate_Key.m
View File

@ -249,14 +249,14 @@
masterPassword = PearlAwait( ^(void (^setResult)(id)) { masterPassword = PearlAwait( ^(void (^setResult)(id)) {
PearlMainQueue( ^{ PearlMainQueue( ^{
UIAlertController *controller = [UIAlertController alertControllerWithTitle:@"Enter Old Master Password" message: 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]; preferredStyle:UIAlertControllerStyleAlert];
[controller addTextFieldWithConfigurationHandler:nil]; [controller addTextFieldWithConfigurationHandler:nil];
[controller addAction:[UIAlertAction actionWithTitle:@"Migrate" style:UIAlertActionStyleDefault handler: [controller addAction:[UIAlertAction actionWithTitle:@"Migrate" style:UIAlertActionStyleDefault handler:
^(UIAlertAction *_Nonnull action) { ^(UIAlertAction *_Nonnull action) {
setResult( controller.textFields.firstObject.text ); 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) { ^(UIAlertAction *_Nonnull action) {
setResult( nil ); setResult( nil );
}]]; }]];

2
platform-darwin/Source/iOS/MPiOSAppDelegate.m
View File

@ -782,7 +782,7 @@
@"Changing your master password will cause all your generated passwords to change!\n" @"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." @"Changing the master password back to the old one will cause your passwords to revert as well."
preferredStyle:UIAlertControllerStyleAlert]; preferredStyle:UIAlertControllerStyleAlert];
[alert addAction:[UIAlertAction actionWithTitle:@"Abort" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) { [alert addAction:[UIAlertAction actionWithTitle:@"Continue" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
[moc performBlockAndWait:^{ [moc performBlockAndWait:^{
inf( @"Clearing keyID for user: %@.", user.userID ); inf( @"Clearing keyID for user: %@.", user.userID );
user.keyID = nil; user.keyID = nil;