diff options
Diffstat (limited to 'src/components/application_manager/src/commands')
66 files changed, 150 insertions, 95 deletions
diff --git a/src/components/application_manager/src/commands/command_notification_from_mobile_impl.cc b/src/components/application_manager/src/commands/command_notification_from_mobile_impl.cc index 5b44abeec9..440d24c79e 100644 --- a/src/components/application_manager/src/commands/command_notification_from_mobile_impl.cc +++ b/src/components/application_manager/src/commands/command_notification_from_mobile_impl.cc @@ -32,6 +32,7 @@ #include "application_manager/commands/command_notification_from_mobile_impl.h" #include "application_manager/application_manager.h" +#include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" namespace application_manager { @@ -63,7 +64,7 @@ void CommandNotificationFromMobileImpl::SendNotification() { LOG4CXX_INFO(logger_, "SendNotification"); MessageHelper::PrintSmartObject(*message_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/command_notification_impl.cc b/src/components/application_manager/src/commands/command_notification_impl.cc index b6b0e7d500..30381320d0 100644 --- a/src/components/application_manager/src/commands/command_notification_impl.cc +++ b/src/components/application_manager/src/commands/command_notification_impl.cc @@ -32,6 +32,7 @@ #include "application_manager/commands/command_notification_impl.h" #include "application_manager/application_manager.h" +#include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" namespace application_manager { @@ -63,7 +64,7 @@ void CommandNotificationImpl::SendNotification() { LOG4CXX_INFO(logger_, "SendNotification"); MessageHelper::PrintSmartObject(*message_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/command_request_impl.cc b/src/components/application_manager/src/commands/command_request_impl.cc index 527d640c5c..69266b1b65 100644 --- a/src/components/application_manager/src/commands/command_request_impl.cc +++ b/src/components/application_manager/src/commands/command_request_impl.cc @@ -37,6 +37,7 @@ #include "utils/make_shared.h" #include "application_manager/commands/command_request_impl.h" #include "application_manager/application_manager.h" +#include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" #include "smart_objects/smart_object.h" @@ -242,7 +243,8 @@ void CommandRequestImpl::onTimeOut() { correlation_id(), mobile_api::Result::GENERIC_ERROR); AddTimeOutComponentInfoToMessage(*response); - application_manager_.ManageMobileCommand(response, ORIGIN_SDL); + application_manager_.GetRPCService().ManageMobileCommand(response, + ORIGIN_SDL); } void CommandRequestImpl::on_event(const event_engine::Event& event) {} @@ -305,7 +307,7 @@ void CommandRequestImpl::SendResponse( is_success_result_ = success; - application_manager_.ManageMobileCommand(result, ORIGIN_SDL); + application_manager_.GetRPCService().ManageMobileCommand(result, ORIGIN_SDL); } bool CommandRequestImpl::CheckSyntax(const std::string& str, @@ -433,7 +435,7 @@ uint32_t CommandRequestImpl::SendHMIRequest( subscribe_on_event(function_id, hmi_correlation_id); } if (ProcessHMIInterfacesAvailability(hmi_correlation_id, function_id)) { - if (!application_manager_.ManageHMICommand(result)) { + if (!application_manager_.GetRPCService().ManageHMICommand(result)) { LOG4CXX_ERROR(logger_, "Unable to send request"); SendResponse(false, mobile_apis::Result::OUT_OF_MEMORY); } @@ -462,7 +464,7 @@ void CommandRequestImpl::CreateHMINotification( notify[strings::params][strings::function_id] = function_id; notify[strings::msg_params] = msg_params; - if (!application_manager_.ManageHMICommand(result)) { + if (!application_manager_.GetRPCService().ManageHMICommand(result)) { LOG4CXX_ERROR(logger_, "Unable to send HMI notification"); } } @@ -627,7 +629,7 @@ bool CommandRequestImpl::CheckAllowedParameters() { correlation_id(), app->app_id()); - application_manager_.SendMessageToMobile(response); + application_manager_.GetRPCService().SendMessageToMobile(response); return false; } diff --git a/src/components/application_manager/src/commands/command_response_impl.cc b/src/components/application_manager/src/commands/command_response_impl.cc index c3265230a8..01eccf552e 100644 --- a/src/components/application_manager/src/commands/command_response_impl.cc +++ b/src/components/application_manager/src/commands/command_response_impl.cc @@ -32,6 +32,7 @@ #include "application_manager/commands/command_response_impl.h" #include "application_manager/application_manager.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -80,7 +81,8 @@ void CommandResponseImpl::SendResponse( } } - application_manager_.SendMessageToMobile(message_, final_message); + application_manager_.GetRPCService().SendMessageToMobile(message_, + final_message); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/get_urls.cc b/src/components/application_manager/src/commands/hmi/get_urls.cc index bfcdf4985e..a229003eed 100644 --- a/src/components/application_manager/src/commands/hmi/get_urls.cc +++ b/src/components/application_manager/src/commands/hmi/get_urls.cc @@ -33,6 +33,7 @@ #include "application_manager/commands/hmi/get_urls.h" #include "application_manager/message.h" #include "application_manager/application_manager.h" +#include "application_manager/rpc_service.h" #include "application_manager/policies/policy_handler.h" #include "utils/helpers.h" @@ -125,7 +126,7 @@ void GetUrls::ProcessServiceURLs(const policy::EndpointUrls& endpoints) { void GetUrls::SendResponseToHMI(hmi_apis::Common_Result::eType result) { (*message_)[strings::params][strings::message_type] = MessageType::kResponse; (*message_)[strings::params][hmi_response::code] = result; - application_manager_.ManageHMICommand(message_); + application_manager_.GetRPCService().ManageHMICommand(message_); } #ifdef PROPRIETARY_MODE diff --git a/src/components/application_manager/src/commands/hmi/get_urls_response.cc b/src/components/application_manager/src/commands/hmi/get_urls_response.cc index dd9686fbce..806c4ce8b0 100644 --- a/src/components/application_manager/src/commands/hmi/get_urls_response.cc +++ b/src/components/application_manager/src/commands/hmi/get_urls_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/get_urls_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { namespace commands { @@ -46,7 +47,7 @@ void GetUrlsResponse::Run() { (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - application_manager_.SendMessageToHMI(message_); + application_manager_.GetRPCService().SendMessageToHMI(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc b/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc index 3c2d73b10c..55ecfd6643 100644 --- a/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc +++ b/src/components/application_manager/src/commands/hmi/notification_from_hmi.cc @@ -32,6 +32,7 @@ #include "application_manager/commands/hmi/notification_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/rpc_service.h" #include "smart_objects/smart_object.h" namespace application_manager { @@ -61,7 +62,7 @@ void NotificationFromHMI::SendNotificationToMobile( const MessageSharedPtr& message) { (*message)[strings::params][strings::message_type] = static_cast<int32_t>(application_manager::MessageType::kNotification); - application_manager_.ManageMobileCommand(message, ORIGIN_SDL); + application_manager_.GetRPCService().ManageMobileCommand(message, ORIGIN_SDL); } void NotificationFromHMI::CreateHMIRequest( @@ -90,7 +91,7 @@ void NotificationFromHMI::CreateHMIRequest( request[strings::msg_params] = msg_params; - if (!application_manager_.ManageHMICommand(result)) { + if (!application_manager_.GetRPCService().ManageHMICommand(result)) { LOG4CXX_ERROR(logger_, "Unable to send request"); return; } diff --git a/src/components/application_manager/src/commands/hmi/notification_to_hmi.cc b/src/components/application_manager/src/commands/hmi/notification_to_hmi.cc index d52df950c3..223111d40a 100644 --- a/src/components/application_manager/src/commands/hmi/notification_to_hmi.cc +++ b/src/components/application_manager/src/commands/hmi/notification_to_hmi.cc @@ -32,6 +32,7 @@ #include "application_manager/commands/hmi/notification_to_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -57,7 +58,7 @@ void NotificationToHMI::Run() {} void NotificationToHMI::SendNotification() { (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - application_manager_.SendMessageToHMI(message_); + application_manager_.GetRPCService().SendMessageToHMI(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc b/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc index cb68b21263..c9920e5d18 100644 --- a/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc @@ -37,6 +37,7 @@ #include <signal.h> #include "application_manager/application_manager.h" +#include "application_manager/rpc_service.h" #include "application_manager/resumption/resume_ctrl.h" #include "interfaces/HMI_API.h" @@ -107,7 +108,7 @@ void OnExitAllApplicationsNotification::SendOnSDLPersistenceComplete() { (*message)[strings::params][strings::correlation_id] = application_manager_.GetNextHMICorrelationID(); - application_manager_.ManageHMICommand(message); + application_manager_.GetRPCService().ManageHMICommand(message); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc b/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc index df9dc01eab..8e43fdfd01 100644 --- a/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_exit_application_notification.cc @@ -35,6 +35,7 @@ #include "application_manager/application_impl.h" #include "application_manager/state_controller.h" #include "application_manager/message_helper.h" +#include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" #ifdef SDL_REMOTE_CONTROL @@ -82,7 +83,7 @@ void OnExitApplicationNotification::Run() { break; } case Common_ApplicationExitReason::UNAUTHORIZED_TRANSPORT_REGISTRATION: { - application_manager_.ManageMobileCommand( + application_manager_.GetRPCService().ManageMobileCommand( MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app_id, AppInterfaceUnregisteredReason::APP_UNAUTHORIZED), commands::Command::ORIGIN_SDL); @@ -91,7 +92,7 @@ void OnExitApplicationNotification::Run() { return; } case Common_ApplicationExitReason::UNSUPPORTED_HMI_RESOURCE: { - application_manager_.ManageMobileCommand( + application_manager_.GetRPCService().ManageMobileCommand( MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app_id, AppInterfaceUnregisteredReason::UNSUPPORTED_HMI_RESOURCE), commands::Command::ORIGIN_SDL); diff --git a/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc b/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc index bd152c2af0..f7fe10f332 100644 --- a/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_tts_language_change_notification.cc @@ -34,6 +34,7 @@ #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" +#include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" namespace application_manager { @@ -77,7 +78,7 @@ void OnTTSLanguageChangeNotification::Run() { if (static_cast<int>(app->language()) != (*message_)[strings::msg_params][strings::language].asInt()) { - application_manager_.ManageMobileCommand( + application_manager_.GetRPCService().ManageMobileCommand( MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app->app_id(), mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), diff --git a/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc index 6e8e38f757..caea874371 100644 --- a/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_ui_language_change_notification.cc @@ -34,6 +34,7 @@ #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" +#include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" namespace application_manager { @@ -76,7 +77,7 @@ void OnUILanguageChangeNotification::Run() { if (app->ui_language() != (*message_)[strings::msg_params][strings::hmi_display_language] .asInt()) { - application_manager_.ManageMobileCommand( + application_manager_.GetRPCService().ManageMobileCommand( MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app->app_id(), mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), diff --git a/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc index bbdb55cde6..c94a341fcb 100644 --- a/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vr_language_change_notification.cc @@ -35,6 +35,7 @@ #include "application_manager/application_impl.h" #include "application_manager/state_controller.h" #include "application_manager/message_helper.h" +#include "application_manager/rpc_service.h" #include "interfaces/MOBILE_API.h" namespace application_manager { @@ -75,7 +76,7 @@ void OnVRLanguageChangeNotification::Run() { application_manager_.state_controller().SetRegularState( app, mobile_api::HMILevel::HMI_NONE, false); - application_manager_.ManageMobileCommand( + application_manager_.GetRPCService().ManageMobileCommand( MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app->app_id(), mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), diff --git a/src/components/application_manager/src/commands/hmi/rc_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/rc_is_ready_request.cc index a976ce1044..f2a638ae33 100644 --- a/src/components/application_manager/src/commands/hmi/rc_is_ready_request.cc +++ b/src/components/application_manager/src/commands/hmi/rc_is_ready_request.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/rc_is_ready_request.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -91,7 +92,7 @@ void RCIsReadyRequest::SendMessageToHMI() { utils::SharedPtr<smart_objects::SmartObject> get_capabilities( MessageHelper::CreateModuleInfoSO( hmi_apis::FunctionID::RC_GetCapabilities, application_manager_)); - application_manager_.ManageHMICommand(get_capabilities); + application_manager_.GetRPCService().ManageHMICommand(get_capabilities); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/request_from_hmi.cc b/src/components/application_manager/src/commands/hmi/request_from_hmi.cc index 5a4e7b149e..10e4ec5141 100644 --- a/src/components/application_manager/src/commands/hmi/request_from_hmi.cc +++ b/src/components/application_manager/src/commands/hmi/request_from_hmi.cc @@ -32,6 +32,7 @@ #include "application_manager/commands/hmi/request_from_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/rpc_service.h" #include "utils/make_shared.h" namespace application_manager { @@ -74,7 +75,7 @@ void RequestFromHMI::SendResponse( (*message)[strings::msg_params][strings::success] = success; (*message)[strings::msg_params][strings::result_code] = result_code; - application_manager_.ManageHMICommand(message); + application_manager_.GetRPCService().ManageHMICommand(message); } void RequestFromHMI::SendErrorResponse( @@ -91,7 +92,7 @@ void RequestFromHMI::SendErrorResponse( (*message)[strings::params][hmi_response::code] = result_code; (*message)[strings::params][strings::error_msg] = error_message; - application_manager_.ManageHMICommand(message); + application_manager_.GetRPCService().ManageHMICommand(message); } void RequestFromHMI::FillCommonParametersOfSO( diff --git a/src/components/application_manager/src/commands/hmi/request_to_hmi.cc b/src/components/application_manager/src/commands/hmi/request_to_hmi.cc index 23c020bca2..d7e889c352 100644 --- a/src/components/application_manager/src/commands/hmi/request_to_hmi.cc +++ b/src/components/application_manager/src/commands/hmi/request_to_hmi.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/request_to_hmi.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -81,7 +82,7 @@ void RequestToHMI::Run() { void RequestToHMI::SendRequest() { (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - application_manager_.SendMessageToHMI(message_); + application_manager_.GetRPCService().SendMessageToHMI(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/response_from_hmi.cc b/src/components/application_manager/src/commands/hmi/response_from_hmi.cc index d6d5d95d07..6ec83debb0 100644 --- a/src/components/application_manager/src/commands/hmi/response_from_hmi.cc +++ b/src/components/application_manager/src/commands/hmi/response_from_hmi.cc @@ -31,7 +31,7 @@ */ #include "application_manager/commands/hmi/response_from_hmi.h" - +#include "application_manager/rpc_service.h" #include "smart_objects/smart_object.h" namespace application_manager { @@ -67,7 +67,7 @@ void ResponseFromHMI::SendResponseToMobile( const MessageSharedPtr& message, ApplicationManager& application_manager) { (*message)[strings::params][strings::message_type] = MessageType::kResponse; - application_manager_.ManageMobileCommand(message, ORIGIN_SDL); + application_manager_.GetRPCService().ManageMobileCommand(message, ORIGIN_SDL); } void ResponseFromHMI::CreateHMIRequest( @@ -95,7 +95,7 @@ void ResponseFromHMI::CreateHMIRequest( request[strings::msg_params] = msg_params; - if (!application_manager_.ManageHMICommand(result)) { + if (!application_manager_.GetRPCService().ManageHMICommand(result)) { LOG4CXX_ERROR(logger_, "Unable to send request"); return; } diff --git a/src/components/application_manager/src/commands/hmi/response_to_hmi.cc b/src/components/application_manager/src/commands/hmi/response_to_hmi.cc index de1e1e0fde..c662bd629c 100644 --- a/src/components/application_manager/src/commands/hmi/response_to_hmi.cc +++ b/src/components/application_manager/src/commands/hmi/response_to_hmi.cc @@ -32,6 +32,7 @@ #include "application_manager/commands/hmi/response_to_hmi.h" #include "application_manager/application_manager.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -56,7 +57,7 @@ void ResponseToHMI::Run() { (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - application_manager_.SendMessageToHMI(message_); + application_manager_.GetRPCService().SendMessageToHMI(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc b/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc index 75a8c0b241..e63ec0f6ee 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_activate_app_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/sdl_activate_app_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -47,7 +48,7 @@ void SDLActivateAppResponse::Run() { (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - application_manager_.SendMessageToHMI(message_); + application_manager_.GetRPCService().SendMessageToHMI(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc b/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc index 521b59a0ec..11a6f77ef0 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/sdl_get_list_of_permissions_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -47,7 +48,7 @@ void SDLGetListOfPermissionsResponse::Run() { (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - application_manager_.SendMessageToHMI(message_); + application_manager_.GetRPCService().SendMessageToHMI(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc b/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc index 0af7e0217a..b1d3ffec62 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_get_status_update_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/sdl_get_status_update_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -47,7 +48,7 @@ void SDLGetStatusUpdateResponse::Run() { (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - application_manager_.SendMessageToHMI(message_); + application_manager_.GetRPCService().SendMessageToHMI(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc b/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc index c693625dbb..5bf3527233 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/sdl_get_user_friendly_message_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -47,7 +48,7 @@ void SDLGetUserFriendlyMessageResponse::Run() { (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - application_manager_.SendMessageToHMI(message_); + application_manager_.GetRPCService().SendMessageToHMI(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc index 71e89dd9b9..85a6405196 100644 --- a/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_is_ready_request.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/tts_is_ready_request.h" +#include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" namespace application_manager { @@ -90,16 +91,16 @@ void TTSIsReadyRequest::SendMessageToHMI() { application_manager_)); HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_handle_response_for(*get_language); - application_manager_.ManageHMICommand(get_language); + application_manager_.GetRPCService().ManageHMICommand(get_language); utils::SharedPtr<smart_objects::SmartObject> get_all_languages( MessageHelper::CreateModuleInfoSO( hmi_apis::FunctionID::TTS_GetSupportedLanguages, application_manager_)); - application_manager_.ManageHMICommand(get_all_languages); + application_manager_.GetRPCService().ManageHMICommand(get_all_languages); utils::SharedPtr<smart_objects::SmartObject> get_capabilities( MessageHelper::CreateModuleInfoSO( hmi_apis::FunctionID::TTS_GetCapabilities, application_manager_)); - application_manager_.ManageHMICommand(get_capabilities); + application_manager_.GetRPCService().ManageHMICommand(get_capabilities); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc index 9e27e23d34..5d7f6d0f4e 100644 --- a/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_is_ready_request.cc @@ -32,6 +32,7 @@ #include "application_manager/commands/hmi/ui_is_ready_request.h" #include "application_manager/message_helper.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -89,16 +90,16 @@ void UIIsReadyRequest::SendMessageToHMI() { application_manager_)); HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_handle_response_for(*get_language); - application_manager_.ManageHMICommand(get_language); + application_manager_.GetRPCService().ManageHMICommand(get_language); utils::SharedPtr<smart_objects::SmartObject> get_all_languages( MessageHelper::CreateModuleInfoSO( hmi_apis::FunctionID::UI_GetSupportedLanguages, application_manager_)); - application_manager_.ManageHMICommand(get_all_languages); + application_manager_.GetRPCService().ManageHMICommand(get_all_languages); utils::SharedPtr<smart_objects::SmartObject> get_capabilities( MessageHelper::CreateModuleInfoSO( hmi_apis::FunctionID::UI_GetCapabilities, application_manager_)); - application_manager_.ManageHMICommand(get_capabilities); + application_manager_.GetRPCService().ManageHMICommand(get_capabilities); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/update_sdl_response.cc b/src/components/application_manager/src/commands/hmi/update_sdl_response.cc index 0e8978fe89..f8fa188735 100644 --- a/src/components/application_manager/src/commands/hmi/update_sdl_response.cc +++ b/src/components/application_manager/src/commands/hmi/update_sdl_response.cc @@ -30,6 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/update_sdl_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ void UpdateSDLResponse::Run() { (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - application_manager_.SendMessageToHMI(message_); + application_manager_.GetRPCService().SendMessageToHMI(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc index ddd08695a0..4d9f30baaa 100644 --- a/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_is_ready_request.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/vi_is_ready_request.h" +#include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" namespace application_manager { @@ -95,7 +96,7 @@ void VIIsReadyRequest::SendMessageToHMI() { MessageHelper::CreateModuleInfoSO( hmi_apis::FunctionID::VehicleInfo_GetVehicleType, application_manager_)); - application_manager_.ManageHMICommand(get_type); + application_manager_.GetRPCService().ManageHMICommand(get_type); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc index 086b5d4490..a1509b153f 100644 --- a/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_is_ready_request.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/vr_is_ready_request.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -89,16 +90,16 @@ void VRIsReadyRequest::SendMessageToHMI() { application_manager_)); HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_handle_response_for(*get_language); - application_manager_.ManageHMICommand(get_language); + application_manager_.GetRPCService().ManageHMICommand(get_language); utils::SharedPtr<smart_objects::SmartObject> get_all_languages( MessageHelper::CreateModuleInfoSO( hmi_apis::FunctionID::VR_GetSupportedLanguages, application_manager_)); - application_manager_.ManageHMICommand(get_all_languages); + application_manager_.GetRPCService().ManageHMICommand(get_all_languages); utils::SharedPtr<smart_objects::SmartObject> get_capabilities( MessageHelper::CreateModuleInfoSO( hmi_apis::FunctionID::VR_GetCapabilities, application_manager_)); - application_manager_.ManageHMICommand(get_capabilities); + application_manager_.GetRPCService().ManageHMICommand(get_capabilities); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/add_command_response.cc b/src/components/application_manager/src/commands/mobile/add_command_response.cc index fc468f9c57..944b2883e8 100644 --- a/src/components/application_manager/src/commands/mobile/add_command_response.cc +++ b/src/components/application_manager/src/commands/mobile/add_command_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/add_command_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ AddCommandResponse::~AddCommandResponse() {} void AddCommandResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/add_sub_menu_response.cc b/src/components/application_manager/src/commands/mobile/add_sub_menu_response.cc index 1fbdb4e66c..de8739d871 100644 --- a/src/components/application_manager/src/commands/mobile/add_sub_menu_response.cc +++ b/src/components/application_manager/src/commands/mobile/add_sub_menu_response.cc @@ -32,7 +32,7 @@ */ #include "application_manager/commands/mobile/add_sub_menu_response.h" - +#include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" namespace application_manager { @@ -48,7 +48,7 @@ AddSubMenuResponse::~AddSubMenuResponse() {} void AddSubMenuResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/alert_maneuver_response.cc b/src/components/application_manager/src/commands/mobile/alert_maneuver_response.cc index 2f441594c2..852083e6ad 100644 --- a/src/components/application_manager/src/commands/mobile/alert_maneuver_response.cc +++ b/src/components/application_manager/src/commands/mobile/alert_maneuver_response.cc @@ -32,7 +32,7 @@ */ #include "application_manager/commands/mobile/alert_maneuver_response.h" - +#include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" namespace application_manager { @@ -48,7 +48,7 @@ AlertManeuverResponse::~AlertManeuverResponse() {} void AlertManeuverResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/alert_response.cc b/src/components/application_manager/src/commands/mobile/alert_response.cc index f8ca487eae..3b9e67fefa 100644 --- a/src/components/application_manager/src/commands/mobile/alert_response.cc +++ b/src/components/application_manager/src/commands/mobile/alert_response.cc @@ -32,7 +32,7 @@ */ #include "application_manager/commands/mobile/alert_response.h" - +#include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" @@ -50,7 +50,7 @@ AlertResponse::~AlertResponse() {} void AlertResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/change_registration_response.cc b/src/components/application_manager/src/commands/mobile/change_registration_response.cc index 210cae64c5..77c063ac9d 100644 --- a/src/components/application_manager/src/commands/mobile/change_registration_response.cc +++ b/src/components/application_manager/src/commands/mobile/change_registration_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/change_registration_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ ChangeRegistrationResponse::~ChangeRegistrationResponse() {} void ChangeRegistrationResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/delete_command_response.cc b/src/components/application_manager/src/commands/mobile/delete_command_response.cc index 7abc1c11d4..bbcdcfe57f 100644 --- a/src/components/application_manager/src/commands/mobile/delete_command_response.cc +++ b/src/components/application_manager/src/commands/mobile/delete_command_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/delete_command_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ DeleteCommandResponse::~DeleteCommandResponse() {} void DeleteCommandResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/delete_sub_menu_response.cc b/src/components/application_manager/src/commands/mobile/delete_sub_menu_response.cc index ad9d2ad858..06a63c5bf5 100644 --- a/src/components/application_manager/src/commands/mobile/delete_sub_menu_response.cc +++ b/src/components/application_manager/src/commands/mobile/delete_sub_menu_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/delete_sub_menu_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ DeleteSubMenuResponse::~DeleteSubMenuResponse() {} void DeleteSubMenuResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/diagnostic_message_response.cc b/src/components/application_manager/src/commands/mobile/diagnostic_message_response.cc index 8c59a97a8b..28c8fa512c 100644 --- a/src/components/application_manager/src/commands/mobile/diagnostic_message_response.cc +++ b/src/components/application_manager/src/commands/mobile/diagnostic_message_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/diagnostic_message_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ DiagnosticMessageResponse::~DiagnosticMessageResponse() {} void DiagnosticMessageResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/dial_number_response.cc b/src/components/application_manager/src/commands/mobile/dial_number_response.cc index 750dcf25c4..ee9bbd0e08 100644 --- a/src/components/application_manager/src/commands/mobile/dial_number_response.cc +++ b/src/components/application_manager/src/commands/mobile/dial_number_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/mobile/dial_number_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -45,7 +46,7 @@ DialNumberResponse::~DialNumberResponse() {} void DialNumberResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_response.cc b/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_response.cc index bb477f5083..ca52aeee65 100644 --- a/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_response.cc +++ b/src/components/application_manager/src/commands/mobile/end_audio_pass_thru_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/end_audio_pass_thru_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ EndAudioPassThruResponse::~EndAudioPassThruResponse() {} void EndAudioPassThruResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/get_dtcs_response.cc b/src/components/application_manager/src/commands/mobile/get_dtcs_response.cc index ecaf5c3d8f..a8111b5e6e 100644 --- a/src/components/application_manager/src/commands/mobile/get_dtcs_response.cc +++ b/src/components/application_manager/src/commands/mobile/get_dtcs_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/get_dtcs_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ GetDTCsResponse::~GetDTCsResponse() {} void GetDTCsResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/get_system_capability_response.cc b/src/components/application_manager/src/commands/mobile/get_system_capability_response.cc index 91c2562cd3..3ac0459e71 100644 --- a/src/components/application_manager/src/commands/mobile/get_system_capability_response.cc +++ b/src/components/application_manager/src/commands/mobile/get_system_capability_response.cc @@ -1,4 +1,5 @@ #include "application_manager/application_manager.h" +#include "application_manager/rpc_service.h" #include "application_manager/commands/mobile/get_system_capability_response.h" namespace application_manager { @@ -14,7 +15,7 @@ GetSystemCapabilityResponse::~GetSystemCapabilityResponse() {} void GetSystemCapabilityResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/get_vehicle_data_response.cc b/src/components/application_manager/src/commands/mobile/get_vehicle_data_response.cc index 1e64746262..700c8adffb 100644 --- a/src/components/application_manager/src/commands/mobile/get_vehicle_data_response.cc +++ b/src/components/application_manager/src/commands/mobile/get_vehicle_data_response.cc @@ -32,7 +32,7 @@ */ #include "application_manager/commands/mobile/get_vehicle_data_response.h" - +#include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" namespace application_manager { @@ -48,7 +48,7 @@ GetVehicleDataResponse::~GetVehicleDataResponse() {} void GetVehicleDataResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/get_way_points_response.cc b/src/components/application_manager/src/commands/mobile/get_way_points_response.cc index 7956b34cae..92e7720d8a 100644 --- a/src/components/application_manager/src/commands/mobile/get_way_points_response.cc +++ b/src/components/application_manager/src/commands/mobile/get_way_points_response.cc @@ -1,5 +1,6 @@ #include "application_manager/application_manager.h" #include "application_manager/commands/mobile/get_way_points_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -14,7 +15,7 @@ GetWayPointsResponse::~GetWayPointsResponse() {} void GetWayPointsResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/list_files_response.cc b/src/components/application_manager/src/commands/mobile/list_files_response.cc index fde15a94ef..0b07605874 100644 --- a/src/components/application_manager/src/commands/mobile/list_files_response.cc +++ b/src/components/application_manager/src/commands/mobile/list_files_response.cc @@ -32,7 +32,7 @@ */ #include "application_manager/commands/mobile/list_files_response.h" - +#include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" namespace application_manager { @@ -48,7 +48,7 @@ ListFilesResponse::~ListFilesResponse() {} void ListFilesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_response.cc b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_response.cc index e8a638c076..1bda9f5096 100644 --- a/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_response.cc +++ b/src/components/application_manager/src/commands/mobile/perform_audio_pass_thru_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/perform_audio_pass_thru_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ PerformAudioPassThruResponse::~PerformAudioPassThruResponse() {} void PerformAudioPassThruResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/perform_interaction_response.cc b/src/components/application_manager/src/commands/mobile/perform_interaction_response.cc index 6003751669..1a358e551c 100644 --- a/src/components/application_manager/src/commands/mobile/perform_interaction_response.cc +++ b/src/components/application_manager/src/commands/mobile/perform_interaction_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/perform_interaction_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ PerformInteractionResponse::~PerformInteractionResponse() {} void PerformInteractionResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/put_file_request.cc b/src/components/application_manager/src/commands/mobile/put_file_request.cc index 269c9c814e..8a5e10b206 100644 --- a/src/components/application_manager/src/commands/mobile/put_file_request.cc +++ b/src/components/application_manager/src/commands/mobile/put_file_request.cc @@ -36,6 +36,7 @@ #include "application_manager/policies/policy_handler.h" #include "application_manager/application_impl.h" +#include "application_manager/rpc_service.h" #include "utils/file_system.h" #include <boost/crc.hpp> @@ -309,7 +310,7 @@ void PutFileRequest::SendOnPutFileNotification() { message[strings::msg_params][strings::length] = length_; message[strings::msg_params][strings::persistent_file] = is_persistent_file_; message[strings::msg_params][strings::file_type] = file_type_; - application_manager_.ManageHMICommand(notification); + application_manager_.GetRPCService().ManageHMICommand(notification); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/read_did_response.cc b/src/components/application_manager/src/commands/mobile/read_did_response.cc index e54c4ba005..f3cdc971aa 100644 --- a/src/components/application_manager/src/commands/mobile/read_did_response.cc +++ b/src/components/application_manager/src/commands/mobile/read_did_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/read_did_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ ReadDIDResponse::~ReadDIDResponse() {} void ReadDIDResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc index ff0d0d3622..41edfad205 100644 --- a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc +++ b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc @@ -47,6 +47,7 @@ #include "application_manager/resumption/resume_ctrl.h" #include "application_manager/policies/policy_handler.h" #include "application_manager/helpers/application_helper.h" +#include "application_manager/rpc_service.h" #include "config_profile/profile.h" #include "interfaces/MOBILE_API.h" #include "interfaces/generated_msg_version.h" @@ -396,7 +397,8 @@ void RegisterAppInterfaceRequest::Run() { SendRegisterAppInterfaceResponseToMobile(ApplicationType::kNewApplication); smart_objects::SmartObjectSPtr so = GetLockScreenIconUrlNotification(connection_key(), application); - application_manager_.ManageMobileCommand(so, commands::Command::ORIGIN_SDL); + application_manager_.GetRPCService().ManageMobileCommand( + so, commands::Command::ORIGIN_SDL); } smart_objects::SmartObjectSPtr @@ -968,7 +970,7 @@ void RegisterAppInterfaceRequest::SendOnAppRegisteredNotificationToHMI( application[strings::night_color_scheme] = *night_color_scheme; } - DCHECK(application_manager_.ManageHMICommand(notification)); + DCHECK(application_manager_.GetRPCService().ManageHMICommand(notification)); } mobile_apis::Result::eType RegisterAppInterfaceRequest::CheckCoincidence() { diff --git a/src/components/application_manager/src/commands/mobile/reset_global_properties_response.cc b/src/components/application_manager/src/commands/mobile/reset_global_properties_response.cc index c621977868..abee868769 100644 --- a/src/components/application_manager/src/commands/mobile/reset_global_properties_response.cc +++ b/src/components/application_manager/src/commands/mobile/reset_global_properties_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/reset_global_properties_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ ResetGlobalPropertiesResponse::~ResetGlobalPropertiesResponse() {} void ResetGlobalPropertiesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/scrollable_message_response.cc b/src/components/application_manager/src/commands/mobile/scrollable_message_response.cc index a5b16bdb70..d6c786b1ee 100644 --- a/src/components/application_manager/src/commands/mobile/scrollable_message_response.cc +++ b/src/components/application_manager/src/commands/mobile/scrollable_message_response.cc @@ -32,7 +32,7 @@ */ #include "application_manager/commands/mobile/scrollable_message_response.h" - +#include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" #include "interfaces/MOBILE_API.h" @@ -55,7 +55,7 @@ void ScrollableMessageResponse::Run() { application->UnsubscribeFromSoftButtons( (*message_)[strings::params][strings::function_id].asInt()); } - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/send_haptic_data_response.cc b/src/components/application_manager/src/commands/mobile/send_haptic_data_response.cc index c8649d34af..9860f89065 100644 --- a/src/components/application_manager/src/commands/mobile/send_haptic_data_response.cc +++ b/src/components/application_manager/src/commands/mobile/send_haptic_data_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/mobile/send_haptic_data_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -45,7 +46,7 @@ SendHapticDataResponse::~SendHapticDataResponse() {} void SendHapticDataResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/send_location_response.cc b/src/components/application_manager/src/commands/mobile/send_location_response.cc index 167642e390..3968e566e3 100644 --- a/src/components/application_manager/src/commands/mobile/send_location_response.cc +++ b/src/components/application_manager/src/commands/mobile/send_location_response.cc @@ -32,7 +32,7 @@ */ #include "application_manager/commands/mobile/send_location_response.h" - +#include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" #include "interfaces/HMI_API.h" @@ -49,7 +49,7 @@ SendLocationResponse::~SendLocationResponse() {} void SendLocationResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/set_app_icon_response.cc b/src/components/application_manager/src/commands/mobile/set_app_icon_response.cc index 29f3950ffc..57e4f5600d 100644 --- a/src/components/application_manager/src/commands/mobile/set_app_icon_response.cc +++ b/src/components/application_manager/src/commands/mobile/set_app_icon_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/set_app_icon_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ SetAppIconResponse::~SetAppIconResponse() {} void SetAppIconResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/set_display_layout_response.cc b/src/components/application_manager/src/commands/mobile/set_display_layout_response.cc index b5e53803c8..fe5c73dd7d 100644 --- a/src/components/application_manager/src/commands/mobile/set_display_layout_response.cc +++ b/src/components/application_manager/src/commands/mobile/set_display_layout_response.cc @@ -33,6 +33,7 @@ #include "application_manager/commands/mobile/set_display_layout_response.h" #include "application_manager/application_impl.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -47,7 +48,7 @@ SetDisplayLayoutResponse::~SetDisplayLayoutResponse() {} void SetDisplayLayoutResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/set_global_properties_response.cc b/src/components/application_manager/src/commands/mobile/set_global_properties_response.cc index 5cfbcb2d58..cea090f35b 100644 --- a/src/components/application_manager/src/commands/mobile/set_global_properties_response.cc +++ b/src/components/application_manager/src/commands/mobile/set_global_properties_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/set_global_properties_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ SetGlobalPropertiesResponse::~SetGlobalPropertiesResponse() {} void SetGlobalPropertiesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/set_icon_response.cc b/src/components/application_manager/src/commands/mobile/set_icon_response.cc index c140d04f51..524d4e3ad9 100644 --- a/src/components/application_manager/src/commands/mobile/set_icon_response.cc +++ b/src/components/application_manager/src/commands/mobile/set_icon_response.cc @@ -33,6 +33,7 @@ #include "application_manager/commands/mobile/set_icon_response.h" #include "application_manager/application_manager.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -47,7 +48,7 @@ SetIconResponse::~SetIconResponse() {} void SetIconResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/set_media_clock_timer_response.cc b/src/components/application_manager/src/commands/mobile/set_media_clock_timer_response.cc index 30e802a1db..d189891888 100644 --- a/src/components/application_manager/src/commands/mobile/set_media_clock_timer_response.cc +++ b/src/components/application_manager/src/commands/mobile/set_media_clock_timer_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/set_media_clock_timer_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ SetMediaClockTimerResponse::~SetMediaClockTimerResponse() {} void SetMediaClockTimerResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/show_constant_tbt_response.cc b/src/components/application_manager/src/commands/mobile/show_constant_tbt_response.cc index 80a36129cf..d2cdc1689a 100644 --- a/src/components/application_manager/src/commands/mobile/show_constant_tbt_response.cc +++ b/src/components/application_manager/src/commands/mobile/show_constant_tbt_response.cc @@ -32,7 +32,7 @@ */ #include "application_manager/commands/mobile/show_constant_tbt_response.h" - +#include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" namespace application_manager { @@ -49,7 +49,7 @@ ShowConstantTBTResponse::~ShowConstantTBTResponse() {} void ShowConstantTBTResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/show_response.cc b/src/components/application_manager/src/commands/mobile/show_response.cc index 8027c908f1..b3a54ee2dd 100644 --- a/src/components/application_manager/src/commands/mobile/show_response.cc +++ b/src/components/application_manager/src/commands/mobile/show_response.cc @@ -32,7 +32,7 @@ */ #include "application_manager/commands/mobile/show_response.h" - +#include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" #include "interfaces/HMI_API.h" @@ -49,7 +49,7 @@ ShowResponse::~ShowResponse() {} void ShowResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/slider_response.cc b/src/components/application_manager/src/commands/mobile/slider_response.cc index 2cfcaf48fd..4664689f0c 100644 --- a/src/components/application_manager/src/commands/mobile/slider_response.cc +++ b/src/components/application_manager/src/commands/mobile/slider_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/slider_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ SliderResponse::~SliderResponse() {} void SliderResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/speak_response.cc b/src/components/application_manager/src/commands/mobile/speak_response.cc index 612d32c913..59b327e009 100644 --- a/src/components/application_manager/src/commands/mobile/speak_response.cc +++ b/src/components/application_manager/src/commands/mobile/speak_response.cc @@ -32,7 +32,7 @@ */ #include "application_manager/commands/mobile/speak_response.h" - +#include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" #include "interfaces/HMI_API.h" @@ -49,7 +49,7 @@ SpeakResponse::~SpeakResponse() {} void SpeakResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_response.cc b/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_response.cc index 7ed16407a5..2f2ddc5acf 100644 --- a/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_response.cc +++ b/src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_response.cc @@ -32,7 +32,7 @@ */ #include "application_manager/commands/mobile/subscribe_vehicle_data_response.h" - +#include "application_manager/rpc_service.h" #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" @@ -47,7 +47,7 @@ SubscribeVehicleDataResponse::~SubscribeVehicleDataResponse() {} void SubscribeVehicleDataResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/subscribe_way_points_response.cc b/src/components/application_manager/src/commands/mobile/subscribe_way_points_response.cc index c2e642619a..8e1e203e52 100644 --- a/src/components/application_manager/src/commands/mobile/subscribe_way_points_response.cc +++ b/src/components/application_manager/src/commands/mobile/subscribe_way_points_response.cc @@ -1,4 +1,5 @@ #include "application_manager/application_manager.h" +#include "application_manager/rpc_service.h" #include "application_manager/commands/mobile/subscribe_way_points_response.h" namespace application_manager { @@ -14,7 +15,7 @@ SubscribeWayPointsResponse::~SubscribeWayPointsResponse() {} void SubscribeWayPointsResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/system_response.cc b/src/components/application_manager/src/commands/mobile/system_response.cc index f5bc03f4a5..0d994bb190 100644 --- a/src/components/application_manager/src/commands/mobile/system_response.cc +++ b/src/components/application_manager/src/commands/mobile/system_response.cc @@ -32,6 +32,7 @@ */ #include "application_manager/commands/mobile/system_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -46,7 +47,7 @@ SystemResponse::~SystemResponse() {} void SystemResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc index d40ad9c870..10cb54a8a1 100644 --- a/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc +++ b/src/components/application_manager/src/commands/mobile/unregister_app_interface_request.cc @@ -32,7 +32,7 @@ */ #include "application_manager/commands/mobile/unregister_app_interface_request.h" - +#include "application_manager/rpc_service.h" #include "application_manager/message_helper.h" namespace application_manager { @@ -48,7 +48,7 @@ void UnregisterAppInterfaceRequest::Run() { return; } - application_manager_.ManageMobileCommand( + application_manager_.GetRPCService().ManageMobileCommand( MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( connection_key(), mobile_api::AppInterfaceUnregisteredReason::INVALID_ENUM), diff --git a/src/components/application_manager/src/commands/mobile/unsubscribe_way_points_response.cc b/src/components/application_manager/src/commands/mobile/unsubscribe_way_points_response.cc index f6430d1f0d..843a2fd5f0 100644 --- a/src/components/application_manager/src/commands/mobile/unsubscribe_way_points_response.cc +++ b/src/components/application_manager/src/commands/mobile/unsubscribe_way_points_response.cc @@ -1,5 +1,6 @@ #include "application_manager/application_manager.h" #include "application_manager/commands/mobile/unsubscribe_way_points_response.h" +#include "application_manager/rpc_service.h" namespace application_manager { @@ -14,7 +15,7 @@ UnsubscribeWayPointsResponse::~UnsubscribeWayPointsResponse() {} void UnsubscribeWayPointsResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/mobile/update_turn_list_response.cc b/src/components/application_manager/src/commands/mobile/update_turn_list_response.cc index d40a4546fc..ca5e8c1b34 100644 --- a/src/components/application_manager/src/commands/mobile/update_turn_list_response.cc +++ b/src/components/application_manager/src/commands/mobile/update_turn_list_response.cc @@ -32,7 +32,7 @@ */ #include "application_manager/commands/mobile/update_turn_list_response.h" - +#include "application_manager/rpc_service.h" #include "interfaces/HMI_API.h" namespace application_manager { @@ -48,7 +48,7 @@ UpdateTurnListResponse::~UpdateTurnListResponse() {} void UpdateTurnListResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager_.SendMessageToMobile(message_); + application_manager_.GetRPCService().SendMessageToMobile(message_); } } // namespace commands |