diff options
author | KVGrygoriev <KVGrygoriev@luxoft.com> | 2018-05-21 18:38:17 +0300 |
---|---|---|
committer | KVGrygoriev <KVGrygoriev@luxoft.com> | 2018-05-21 18:38:17 +0300 |
commit | 0ee90cad1abd27350bd93206e514c9d3b9483c2d (patch) | |
tree | e006b3d358e6cbd6c4b17546c8c11d508d4d4820 | |
parent | 9e82b498bc6abb19793e4ab73a9070d679488297 (diff) | |
download | sdl_core-feature/submenu_icon.tar.gz |
Remove excess check. Remove multiple get for the msg_params in SmartObjectfeature/submenu_icon
-rw-r--r-- | src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc b/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc index 808cd669f8..486e0a7921 100644 --- a/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc +++ b/src/components/application_manager/src/commands/mobile/add_sub_menu_request.cc @@ -58,9 +58,15 @@ void AddSubMenuRequest::Run() { return; } - if ((*message_)[strings::msg_params].keyExists(strings::menu_icon)) { - mobile_apis::Result::eType verification_result = MessageHelper::VerifyImage( - (*message_)[strings::msg_params][strings::menu_icon], + + smart_objects::SmartObject received_msg_params = + (*message_)[strings::msg_params]; + mobile_apis::Result::eType verification_result = + mobile_apis::Result::INVALID_ENUM; + + if (received_msg_params.keyExists(strings::menu_icon)) { + verification_result = MessageHelper::VerifyImage( + received_msg_params[strings::menu_icon], app, application_manager_); @@ -72,7 +78,7 @@ void AddSubMenuRequest::Run() { } const int32_t menu_id = - (*message_)[strings::msg_params][strings::menu_id].asInt(); + received_msg_params[strings::menu_id].asInt(); if (app->FindSubMenu(menu_id)) { LOG4CXX_ERROR(logger_, "Menu with id " << menu_id << " is not found."); SendResponse(false, mobile_apis::Result::INVALID_ID); @@ -80,7 +86,7 @@ void AddSubMenuRequest::Run() { } const std::string& menu_name = - (*message_)[strings::msg_params][strings::menu_name].asString(); + received_msg_params[strings::menu_name].asString(); if (app->IsSubMenuNameAlreadyExist(menu_name)) { LOG4CXX_ERROR(logger_, "Menu name " << menu_name << " is duplicated."); @@ -98,22 +104,17 @@ void AddSubMenuRequest::Run() { smart_objects::SmartObject(smart_objects::SmartType_Map); msg_params[strings::menu_id] = - (*message_)[strings::msg_params][strings::menu_id]; - if ((*message_)[strings::msg_params].keyExists(strings::position)) { + received_msg_params[strings::menu_id]; + if (received_msg_params.keyExists(strings::position)) { msg_params[strings::menu_params][strings::position] = - (*message_)[strings::msg_params][strings::position]; + received_msg_params[strings::position]; } msg_params[strings::menu_params][strings::menu_name] = - (*message_)[strings::msg_params][strings::menu_name]; + received_msg_params[strings::menu_name]; msg_params[strings::app_id] = app->app_id(); - if (((*message_)[strings::msg_params].keyExists(strings::menu_icon)) && - ((*message_)[strings::msg_params][strings::menu_icon].keyExists( - strings::value)) && - (0 < (*message_)[strings::msg_params][strings::menu_icon][strings::value] - .length())) { - msg_params[strings::menu_icon] = - (*message_)[strings::msg_params][strings::menu_icon]; + if (mobile_apis::Result::SUCCESS == verification_result) { + msg_params[strings::menu_icon] = received_msg_params[strings::menu_icon]; } StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI); |