mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6743 from electron/recovery-suggestion

Browse source 
Add recovery suggestion to auto update failure string
This commit is contained in:
Cheng Zhao 2016-08-08 16:02:13 +09:00 committed by GitHub
commit fd461cdd27
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
atom/browser/auto_updater_mac.mm
View file

@ -104,11 +104,18 @@ void AutoUpdater::CheckForUpdates() {
delegate->OnUpdateNotAvailable();
}
} error:^(NSError *error) {
NSString* failureString = error.localizedFailureReason ?
[NSString stringWithFormat:@"%@: %@",
error.localizedDescription,
error.localizedFailureReason] :
[NSString stringWithString:error.localizedDescription];
NSMutableString* failureString =
[NSMutableString stringWithString:error.localizedDescription];
if (error.localizedFailureReason) {
[failureString appendString:@": "];
[failureString appendString:error.localizedFailureReason];
}
if (error.localizedRecoverySuggestion) {
if (![failureString hasSuffix:@"."])
[failureString appendString:@"."];
[failureString appendString:@" "];
[failureString appendString:error.localizedRecoverySuggestion];
}
delegate->OnError(base::SysNSStringToUTF8(failureString));
}];
}