From af4b2c7e549531040c0029bada95398b1459d2b6 Mon Sep 17 00:00:00 2001 From: "Yaroslav Mamykin (GitHub)" Date: Fri, 4 Oct 2019 23:22:20 +0300 Subject: fixup! Fix versioning appliance for vehicle data --- .../src/commands/mobile/register_app_interface_request.cc | 6 +++++- src/components/application_manager/src/rpc_handler_impl.cc | 5 +++-- 2 files changed, 8 insertions(+), 3 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 b32f660bd2..14a94fd1a2 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 @@ -383,7 +383,11 @@ void RegisterAppInterfaceRequest::Run() { // Version negotiation utils::SemanticVersion module_version( major_version, minor_version, patch_version); - if (mobile_version < module_version) { + if (mobile_version < utils::rpc_version_5) { + // Mobile versioning did not exist for + // versions before 5.0 + application->set_msg_version(utils::base_rpc_version); + } else if (mobile_version < module_version) { // Use mobile RPC version as negotiated version application->set_msg_version(mobile_version); } else { diff --git a/src/components/application_manager/src/rpc_handler_impl.cc b/src/components/application_manager/src/rpc_handler_impl.cc index afe0533d25..9a1d815bb2 100644 --- a/src/components/application_manager/src/rpc_handler_impl.cc +++ b/src/components/application_manager/src/rpc_handler_impl.cc @@ -31,7 +31,6 @@ */ #include "application_manager/rpc_handler_impl.h" - #include "application_manager/app_service_manager.h" #include "application_manager/plugin_manager/plugin_keys.h" @@ -312,7 +311,9 @@ void RPCHandlerImpl::GetMessageVersion( message_version = utils::base_rpc_version; utils::SemanticVersion temp_version(major, minor, patch); if (temp_version.isValid()) { - message_version = temp_version; + message_version = (temp_version >= utils::rpc_version_5) + ? temp_version + : utils::base_rpc_version; } } } -- cgit v1.2.1