Fixes adding failures to NSErrors with nil localizedFailureReasons

This commit is contained in:
Riley Testut
2022-12-15 15:59:39 -06:00
parent 5efb9f8448
commit 503d535823
2 changed files with 42 additions and 3 deletions

View File

@@ -36,12 +36,14 @@
- (NSString *)localizedDescription
{
NSString *localizedFailureReason = self.wrappedError.localizedFailureReason ?: self.wrappedError.localizedDescription;
NSString *wrappedLocalizedDescription = self.wrappedError.userInfo[NSLocalizedDescriptionKey];
if (wrappedLocalizedDescription != nil)
{
NSString *localizedFailure = self.wrappedError.userInfo[NSLocalizedFailureErrorKey];
NSString *fallbackDescription = localizedFailure != nil ? [NSString stringWithFormat:@"%@ %@", localizedFailure, self.wrappedError.localizedFailureReason] : self.wrappedError.localizedFailureReason;
NSString *fallbackDescription = localizedFailure != nil ? [NSString stringWithFormat:@"%@ %@", localizedFailure, localizedFailureReason] : localizedFailureReason;
if (![wrappedLocalizedDescription isEqualToString:fallbackDescription])
{
return wrappedLocalizedDescription;
@@ -51,8 +53,6 @@
NSString *localizedFailure = self.userInfo[NSLocalizedFailureErrorKey];
if (localizedFailure != nil)
{
NSString *localizedFailureReason = self.wrappedError.localizedFailureReason ?: self.wrappedError.localizedDescription;
NSString *localizedDescription = [NSString stringWithFormat:@"%@ %@", localizedFailure, localizedFailureReason];
return localizedDescription;
}