diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2020-12-08 15:14:19 -0500 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2020-12-08 15:14:19 -0500 |
| commit | d2ab459c8a7cb93126827502eb2f60a7e83da621 (patch) | |
| tree | 3d04dd0a73b6fa1807ec2420bc31ab477ea2aa22 | |
| parent | 16ab3f06ad08fcfba6ebcdbe50c0602a48f53784 (diff) | |
| download | sdl_ios-bugfix/issue-827-add-version-check.tar.gz | |
Fix printing null if no patch version is presentbugfix/issue-827-add-version-check
| -rw-r--r-- | SmartDeviceLink/private/SDLLifecycleManager.m | 2 | ||||
| -rw-r--r-- | SmartDeviceLink/public/SDLMsgVersion.m | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/SmartDeviceLink/private/SDLLifecycleManager.m b/SmartDeviceLink/private/SDLLifecycleManager.m index 655826f43..b08cb8758 100644 --- a/SmartDeviceLink/private/SDLLifecycleManager.m +++ b/SmartDeviceLink/private/SDLLifecycleManager.m @@ -395,7 +395,7 @@ NSString *const BackgroundTaskTransportName = @"com.sdl.transport.backgroundTask weakSelf.registerResponse = (SDLRegisterAppInterfaceResponse *)response; [SDLGlobals sharedGlobals].rpcVersion = [SDLVersion versionWithSDLMsgVersion:weakSelf.registerResponse.sdlMsgVersion]; - SDLLogD(@"Did register app; RPC version: %@, SDL version: %@, starting languages: (VR) %@, (HMI) %@, vehicle type: %@", weakSelf.registerResponse.sdlMsgVersion, weakSelf.registerResponse.sdlVersion, weakSelf.registerResponse.language, weakSelf.registerResponse.hmiDisplayLanguage, weakSelf.registerResponse.vehicleType); + SDLLogD(@"Did register app; RPC version: %@, SDL version: %@, starting languages: (VR) %@, (HMI) %@, vehicle type: %@", weakSelf.registerResponse.sdlMsgVersion, (weakSelf.registerResponse.sdlVersion ?: @"unavailable"), weakSelf.registerResponse.language, weakSelf.registerResponse.hmiDisplayLanguage, weakSelf.registerResponse.vehicleType); [weakSelf sdl_transitionToState:SDLLifecycleStateRegistered]; }]; diff --git a/SmartDeviceLink/public/SDLMsgVersion.m b/SmartDeviceLink/public/SDLMsgVersion.m index dce291b1b..ee0dc04fa 100644 --- a/SmartDeviceLink/public/SDLMsgVersion.m +++ b/SmartDeviceLink/public/SDLMsgVersion.m @@ -52,7 +52,7 @@ } - (NSString *)description { - return [NSString stringWithFormat:@"%@.%@.%@", self.majorVersion, self.minorVersion, self.patchVersion]; + return [NSString stringWithFormat:@"%@.%@.%@", self.majorVersion, self.minorVersion, (self.patchVersion ?: @"0")]; } @end |