diff options
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc')
-rw-r--r-- | src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc index 14eba3f34f..a3269847a1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc @@ -1157,18 +1157,23 @@ bool PerformInteractionRequest::SetChoiceIdToResponseMsgParams( return false; } - if (mobile_apis::InteractionMode::eType::MANUAL_ONLY == interaction_mode_) { - msg_param[strings::choice_id] = ui_choice_id_received_; - return true; - } - - if (mobile_apis::InteractionMode::eType::VR_ONLY == interaction_mode_) { - msg_param[strings::choice_id] = vr_choice_id_received_; - return true; + switch (interaction_mode_) { + case mobile_apis::InteractionMode::eType::MANUAL_ONLY: + if (ui_choice_id_valid) { + msg_param[strings::choice_id] = ui_choice_id_received_; + } + case mobile_apis::InteractionMode::eType::VR_ONLY: + if (vr_choice_id_valid) { + msg_param[strings::choice_id] = vr_choice_id_received_; + } + default: + if (ui_choice_id_valid) { + msg_param[strings::choice_id] = ui_choice_id_received_; + } else if (vr_choice_id_valid) { + msg_param[strings::choice_id] = vr_choice_id_received_; + } } - msg_param[strings::choice_id] = - ui_choice_id_valid ? ui_choice_id_received_ : vr_choice_id_received_; return true; } |