nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 16:22:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Recovery attempt for save without password now also adheres to cancel

Browse Source
This commit is contained in:
michael starke
2016-08-31 18:26:46 +02:00
parent a79f815f99
commit 9e09565365
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MacPass/MPErrorRecoveryAttempter.m
View File

@@ -21,19 +21,29 @@
*/ */
- (void)attemptRecoveryFromError:(NSError *)error optionIndex:(NSUInteger)recoveryOptionIndex delegate:(nullable id)delegate didRecoverSelector:(nullable SEL)didRecoverSelector contextInfo:(nullable void *)contextInfo { - (void)attemptRecoveryFromError:(NSError *)error optionIndex:(NSUInteger)recoveryOptionIndex delegate:(nullable id)delegate didRecoverSelector:(nullable SEL)didRecoverSelector contextInfo:(nullable void *)contextInfo {
NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[delegate methodSignatureForSelector:didRecoverSelector]]; NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[delegate methodSignatureForSelector:didRecoverSelector]];
__block void *contextInfoCopy = contextInfo;
if(error.code == MPErrorNoPasswordOrKeyFile) { if(error.code == MPErrorNoPasswordOrKeyFile) {
if([delegate isKindOfClass:[MPDocument class]]) { if([delegate isKindOfClass:[MPDocument class]]) {
MPDocument *document = delegate; MPDocument *document = delegate;
BOOL didRecover = NO;
if(recoveryOptionIndex == 0) {
[document.windowControllers.firstObject editPasswordWithCompetionHandler:^(NSInteger result) { [document.windowControllers.firstObject editPasswordWithCompetionHandler:^(NSInteger result) {
BOOL didRecover = result == NSModalResponseOK; BOOL didRecover = result == NSModalResponseOK;
invocation.target = delegate; invocation.target = delegate;
invocation.selector = didRecoverSelector; invocation.selector = didRecoverSelector;
[invocation setArgument:&didRecover atIndex:2]; [invocation setArgument:&didRecover atIndex:2];
[invocation setArgument:&contextInfo atIndex:3]; [invocation setArgument:&contextInfoCopy atIndex:3];
[invocation invoke]; [invocation invoke];
}]; }];
} }
else {
invocation.target = delegate;
invocation.selector = didRecoverSelector;
[invocation setArgument:&didRecover atIndex:2];
[invocation setArgument:&contextInfo atIndex:3];
[invocation invoke];
}
}
} }
} }