diff options
author | JackLivio <jack@livio.io> | 2018-08-05 20:17:37 -0400 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2018-08-05 20:17:37 -0400 |
commit | bb7175f67985b5595f0b21968a8c3c6db27995db (patch) | |
tree | 3712e23ec19a4a93dc536051c7bc376b72512994 /src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc | |
parent | 6f097fec3432cce5c1e6e3277efba23c4b0d25ab (diff) | |
download | sdl_core-bb7175f67985b5595f0b21968a8c3c6db27995db.tar.gz |
Check Style
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc')
-rw-r--r-- | src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc index cd566e43fd..9b546a1340 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc @@ -293,14 +293,19 @@ void RegisterAppInterfaceRequest::Run() { return; } - uint16_t major = msg_params[strings::sync_msg_version][strings::major_version].asUInt(); - uint16_t minor = msg_params[strings::sync_msg_version][strings::minor_version].asUInt(); + uint16_t major = + msg_params[strings::sync_msg_version][strings::major_version].asUInt(); + uint16_t minor = + msg_params[strings::sync_msg_version][strings::minor_version].asUInt(); uint16_t patch = 0; - if(msg_params[strings::sync_msg_version].keyExists(strings::patch_version)) { - patch = msg_params[strings::sync_msg_version][strings::patch_version].asUInt(); - } - if (major < minimum_major_version || (major == minimum_major_version && minor < minimum_minor_version) - || (major == minimum_major_version && minor == minimum_minor_version && patch < minimum_patch_version)) { + if (msg_params[strings::sync_msg_version].keyExists(strings::patch_version)) { + patch = + msg_params[strings::sync_msg_version][strings::patch_version].asUInt(); + } + if (major < minimum_major_version || + (major == minimum_major_version && minor < minimum_minor_version) || + (major == minimum_major_version && minor == minimum_minor_version && + patch < minimum_patch_version)) { SendResponse(false, mobile_apis::Result::REJECTED); } @@ -311,18 +316,18 @@ void RegisterAppInterfaceRequest::Run() { return; } - //Version negotiation + // Version negotiation utils::SemanticVersion mobile_version(major, minor, patch); - utils::SemanticVersion module_version(major_version, minor_version, patch_version); + utils::SemanticVersion module_version( + major_version, minor_version, patch_version); if (mobile_version < module_version) { - //Use mobile RPC version as negotiated version + // Use mobile RPC version as negotiated version application->set_msg_version(major, minor, patch); } else { - //Use module version as negotiated version + // Use module version as negotiated version application->set_msg_version(major_version, minor_version, patch_version); } - // For resuming application need to restore hmi_app_id from resumeCtrl resumption::ResumeCtrl& resumer = application_manager_.resume_controller(); const std::string& device_mac = application->mac_address(); @@ -609,7 +614,6 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile( return; } - utils::SemanticVersion negotiated_version = application->msg_version(); response_params[strings::sync_msg_version][strings::major_version] = |