diff options
| -rw-r--r-- | SmartDeviceLink/SDLError.h | 10 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLError.m | 40 |
2 files changed, 30 insertions, 20 deletions
diff --git a/SmartDeviceLink/SDLError.h b/SmartDeviceLink/SDLError.h index cae581bee..edfe87bc0 100644 --- a/SmartDeviceLink/SDLError.h +++ b/SmartDeviceLink/SDLError.h @@ -39,14 +39,14 @@ extern SDLErrorDomain *const SDLErrorDomainAudioStreamManager; #pragma mark SDLManager -+ (NSError *)sdl_lifecycle_rpcErrorWithDescription:(NSString *)description andReason:(NSString *)reason; ++ (NSError *)sdl_lifecycle_rpcErrorWithDescription:(nullable NSString *)description andReason:(nullable NSString *)reason; + (NSError *)sdl_lifecycle_notConnectedError; + (NSError *)sdl_lifecycle_notReadyError; -+ (NSError *)sdl_lifecycle_unknownRemoteErrorWithDescription:(NSString *)description andReason:(NSString *)reason; ++ (NSError *)sdl_lifecycle_unknownRemoteErrorWithDescription:(nullable NSString *)description andReason:(nullable NSString *)reason; + (NSError *)sdl_lifecycle_managersFailedToStart; -+ (NSError *)sdl_lifecycle_startedWithBadResult:(SDLResult)result info:(NSString *)info; -+ (NSError *)sdl_lifecycle_startedWithWarning:(SDLResult)result info:(NSString *)info; -+ (NSError *)sdl_lifecycle_failedWithBadResult:(SDLResult)result info:(NSString *)info; ++ (NSError *)sdl_lifecycle_startedWithBadResult:(nullable SDLResult)result info:(nullable NSString *)info; ++ (NSError *)sdl_lifecycle_startedWithWarning:(nullable SDLResult)result info:(nullable NSString *)info; ++ (NSError *)sdl_lifecycle_failedWithBadResult:(nullable SDLResult)result info:(nullable NSString *)info; + (NSError *)sdl_lifecycle_multipleRequestsCancelled; #pragma mark SDLFileManager diff --git a/SmartDeviceLink/SDLError.m b/SmartDeviceLink/SDLError.m index f82f33c8b..7e1f0c65e 100644 --- a/SmartDeviceLink/SDLError.m +++ b/SmartDeviceLink/SDLError.m @@ -69,10 +69,12 @@ SDLErrorDomain *const SDLErrorDomainAudioStreamManager = @"com.sdl.extension.pcm #pragma mark - SDLManager -+ (NSError *)sdl_lifecycle_rpcErrorWithDescription:(NSString *)description andReason:(NSString *)reason { ++ (NSError *)sdl_lifecycle_rpcErrorWithDescription:(nullable NSString *)description andReason:(nullable NSString *)reason { + NSString *descriptionString = description ?: @""; + NSString *reasonString = reason ?: @""; NSDictionary<NSString *, NSString *> *userInfo = @{ - NSLocalizedDescriptionKey: description, - NSLocalizedFailureReasonErrorKey: reason + NSLocalizedDescriptionKey: descriptionString, + NSLocalizedFailureReasonErrorKey: reasonString }; return [NSError errorWithDomain:SDLErrorDomainLifecycleManager code:SDLManagerErrorRPCRequestFailed @@ -101,10 +103,12 @@ SDLErrorDomain *const SDLErrorDomainAudioStreamManager = @"com.sdl.extension.pcm userInfo:userInfo]; } -+ (NSError *)sdl_lifecycle_unknownRemoteErrorWithDescription:(NSString *)description andReason:(NSString *)reason { ++ (NSError *)sdl_lifecycle_unknownRemoteErrorWithDescription:(nullable NSString *)description andReason:(nullable NSString *)reason { + NSString *descriptionString = description ?: @""; + NSString *reasonString = reason ?: @""; NSDictionary<NSString *, NSString *> *userInfo = @{ - NSLocalizedDescriptionKey: description, - NSLocalizedFailureReasonErrorKey: reason + NSLocalizedDescriptionKey: descriptionString, + NSLocalizedFailureReasonErrorKey: reasonString }; return [NSError errorWithDomain:SDLErrorDomainLifecycleManager code:SDLManagerErrorUnknownRemoteError @@ -117,30 +121,36 @@ SDLErrorDomain *const SDLErrorDomainAudioStreamManager = @"com.sdl.extension.pcm userInfo:nil]; } -+ (NSError *)sdl_lifecycle_startedWithBadResult:(SDLResult)result info:(NSString *)info { ++ (NSError *)sdl_lifecycle_startedWithBadResult:(nullable SDLResult)result info:(nullable NSString *)info { + NSString *resultString = result ?: @""; + NSString *infoString = info ?: @""; NSDictionary<NSString *, NSString *> *userInfo = @{ - NSLocalizedDescriptionKey: result, - NSLocalizedFailureReasonErrorKey: info + NSLocalizedDescriptionKey: resultString, + NSLocalizedFailureReasonErrorKey: infoString }; return [NSError errorWithDomain:SDLErrorDomainLifecycleManager code:SDLManagerErrorRegistrationFailed userInfo:userInfo]; } -+ (NSError *)sdl_lifecycle_startedWithWarning:(SDLResult)result info:(NSString *)info { ++ (NSError *)sdl_lifecycle_startedWithWarning:(nullable SDLResult)result info:(nullable NSString *)info { + NSString *resultString = result ?: @""; + NSString *infoString = info ?: @""; NSDictionary<NSString *, NSString *> *userInfo = @{ - NSLocalizedDescriptionKey: result, - NSLocalizedFailureReasonErrorKey: info + NSLocalizedDescriptionKey: resultString, + NSLocalizedFailureReasonErrorKey: infoString }; return [NSError errorWithDomain:SDLErrorDomainLifecycleManager code:SDLManagerErrorRegistrationSuccessWithWarning userInfo:userInfo]; } -+ (NSError *)sdl_lifecycle_failedWithBadResult:(SDLResult)result info:(NSString *)info { ++ (NSError *)sdl_lifecycle_failedWithBadResult:(nullable SDLResult)result info:(nullable NSString *)info { + NSString *resultString = result ?: @""; + NSString *infoString = info ?: @""; NSDictionary<NSString *, NSString *> *userInfo = @{ - NSLocalizedDescriptionKey: result, - NSLocalizedFailureReasonErrorKey: info + NSLocalizedDescriptionKey: resultString, + NSLocalizedFailureReasonErrorKey: infoString }; return [NSError errorWithDomain:SDLErrorDomainLifecycleManager code:SDLManagerErrorRegistrationFailed |