diff options
Diffstat (limited to 'src/components/application_manager/src/commands/hmi')
231 files changed, 1932 insertions, 2046 deletions
diff --git a/src/components/application_manager/src/commands/hmi/activate_app_request.cc b/src/components/application_manager/src/commands/hmi/activate_app_request.cc index c8258bd74a..ea36cd2b0a 100644 --- a/src/components/application_manager/src/commands/hmi/activate_app_request.cc +++ b/src/components/application_manager/src/commands/hmi/activate_app_request.cc @@ -31,41 +31,39 @@ */ #include "application_manager/commands/hmi/activate_app_request.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/message_helper.h" namespace application_manager { - namespace commands { - - ActivateAppRequest::ActivateAppRequest( - const MessageSharedPtr& message): RequestToHMI(message) { - } +namespace commands { +ActivateAppRequest::ActivateAppRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} - ActivateAppRequest::~ActivateAppRequest() { - LOG4CXX_TRACE(logger_, "~ActivateAppRequest"); - } +ActivateAppRequest::~ActivateAppRequest() { + LOG4CXX_TRACE(logger_, "~ActivateAppRequest"); +} - void ActivateAppRequest::Run() { - LOG4CXX_TRACE(logger_, "enter " << correlation_id()); - uint32_t app_id = RequestToHMI::application_id(); - ApplicationManagerImpl::instance()->set_application_id(correlation_id(), app_id); +void ActivateAppRequest::Run() { + LOG4CXX_TRACE(logger_, "enter " << correlation_id()); + uint32_t app_id = RequestToHMI::application_id(); + application_manager_.set_application_id(correlation_id(), app_id); #ifdef ENABLE_LOG - if ((*message_)[strings::msg_params].keyExists( - strings::activate_app_hmi_level)) { - mobile_apis::HMILevel::eType requested_hmi_level = - static_cast<mobile_apis::HMILevel::eType>( - (*message_)[strings::msg_params][strings::activate_app_hmi_level].asInt()); - LOG4CXX_TRACE(logger_, "requested_hmi_level = " - << requested_hmi_level); - } + if ((*message_)[strings::msg_params].keyExists( + strings::activate_app_hmi_level)) { + mobile_apis::HMILevel::eType requested_hmi_level = + static_cast<mobile_apis::HMILevel::eType>( + (*message_)[strings::msg_params][strings::activate_app_hmi_level] + .asInt()); + LOG4CXX_TRACE(logger_, "requested_hmi_level = " << requested_hmi_level); + } #endif - SendRequest(); - LOG4CXX_TRACE(logger_, "exit"); - } + SendRequest(); + LOG4CXX_TRACE(logger_, "exit"); +} - } // namespace commands +} // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/activate_app_response.cc b/src/components/application_manager/src/commands/hmi/activate_app_response.cc index 2f63198d82..55e704b6c4 100644 --- a/src/components/application_manager/src/commands/hmi/activate_app_response.cc +++ b/src/components/application_manager/src/commands/hmi/activate_app_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/activate_app_response.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/message_helper.h" namespace application_manager { @@ -38,17 +38,17 @@ namespace application_manager { namespace commands { ActivateAppResponse::ActivateAppResponse( - const MessageSharedPtr& message): ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -ActivateAppResponse::~ActivateAppResponse() { -} +ActivateAppResponse::~ActivateAppResponse() {} void ActivateAppResponse::Run() { LOG4CXX_TRACE(logger_, "enter"); - event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_ActivateApp); + event_engine::Event event( + hmi_apis::FunctionID::BasicCommunication_ActivateApp); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); LOG4CXX_TRACE(logger_, "exit"); } diff --git a/src/components/application_manager/src/commands/hmi/add_statistics_info_notification.cc b/src/components/application_manager/src/commands/hmi/add_statistics_info_notification.cc index 73c9a49def..ef75eba1e2 100644 --- a/src/components/application_manager/src/commands/hmi/add_statistics_info_notification.cc +++ b/src/components/application_manager/src/commands/hmi/add_statistics_info_notification.cc @@ -39,23 +39,20 @@ namespace application_manager { namespace commands { AddStatisticsInfoNotification::AddStatisticsInfoNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -AddStatisticsInfoNotification::~AddStatisticsInfoNotification() { -} +AddStatisticsInfoNotification::~AddStatisticsInfoNotification() {} void AddStatisticsInfoNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); int type = (*message_)[strings::msg_params][hmi_notification::statistic_type] - .asInt(); + .asInt(); - policy::PolicyHandler::instance()->AddStatisticsInfo(type); + application_manager_.GetPolicyHandler().AddStatisticsInfo(type); } } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/allow_all_apps_request.cc b/src/components/application_manager/src/commands/hmi/allow_all_apps_request.cc index 548238f00f..4e096a2cda 100644 --- a/src/components/application_manager/src/commands/hmi/allow_all_apps_request.cc +++ b/src/components/application_manager/src/commands/hmi/allow_all_apps_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -AllowAllAppsRequest::AllowAllAppsRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +AllowAllAppsRequest::AllowAllAppsRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -AllowAllAppsRequest::~AllowAllAppsRequest() { -} +AllowAllAppsRequest::~AllowAllAppsRequest() {} void AllowAllAppsRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void AllowAllAppsRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/allow_all_apps_response.cc b/src/components/application_manager/src/commands/hmi/allow_all_apps_response.cc index eca9363254..ed05c3ba83 100644 --- a/src/components/application_manager/src/commands/hmi/allow_all_apps_response.cc +++ b/src/components/application_manager/src/commands/hmi/allow_all_apps_response.cc @@ -30,23 +30,21 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/allow_all_apps_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { -AllowAllAppsResponse::AllowAllAppsResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +AllowAllAppsResponse::AllowAllAppsResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -AllowAllAppsResponse::~AllowAllAppsResponse() { -} +AllowAllAppsResponse::~AllowAllAppsResponse() {} void AllowAllAppsResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - ApplicationManagerImpl::instance()->set_all_apps_allowed( + application_manager_.SetAllAppsAllowed( (*message_)[strings::msg_params][hmi_response::allowed].asBool()); } diff --git a/src/components/application_manager/src/commands/hmi/allow_app_request.cc b/src/components/application_manager/src/commands/hmi/allow_app_request.cc index 2f0d4bcc98..5176b3b4fe 100644 --- a/src/components/application_manager/src/commands/hmi/allow_app_request.cc +++ b/src/components/application_manager/src/commands/hmi/allow_app_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -AllowAppRequest::AllowAppRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +AllowAppRequest::AllowAppRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -AllowAppRequest::~AllowAppRequest() { -} +AllowAppRequest::~AllowAppRequest() {} void AllowAppRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void AllowAppRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/allow_app_response.cc b/src/components/application_manager/src/commands/hmi/allow_app_response.cc index 7a7f3dd560..5fd9c702b4 100644 --- a/src/components/application_manager/src/commands/hmi/allow_app_response.cc +++ b/src/components/application_manager/src/commands/hmi/allow_app_response.cc @@ -30,34 +30,33 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/allow_app_response.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/application_impl.h" namespace application_manager { namespace commands { -AllowAppResponse::AllowAppResponse( - const MessageSharedPtr& message): ResponseFromHMI(message) { -} +AllowAppResponse::AllowAppResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -AllowAppResponse::~AllowAppResponse() { -} +AllowAppResponse::~AllowAppResponse() {} void AllowAppResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); uint32_t connection_key = - (*message_)[strings::params][strings::connection_key].asInt(); + (*message_)[strings::params][strings::connection_key].asInt(); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()-> - application(connection_key); + ApplicationSharedPtr app = application_manager_.application(connection_key); if (!app) { LOG4CXX_ERROR(logger_, "NULL pointer"); return; } - app->set_app_allowed((*message_)[strings::msg_params][hmi_response::allowed].asBool()); + app->set_app_allowed( + (*message_)[strings::msg_params][hmi_response::allowed].asBool()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/basic_communication_on_awake_sdl.cc b/src/components/application_manager/src/commands/hmi/basic_communication_on_awake_sdl.cc index b34752a00f..80b1edb5bb 100644 --- a/src/components/application_manager/src/commands/hmi/basic_communication_on_awake_sdl.cc +++ b/src/components/application_manager/src/commands/hmi/basic_communication_on_awake_sdl.cc @@ -29,5 +29,3 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - - diff --git a/src/components/application_manager/src/commands/hmi/basic_communication_system_request.cc b/src/components/application_manager/src/commands/hmi/basic_communication_system_request.cc index d0251a7276..2499c21680 100644 --- a/src/components/application_manager/src/commands/hmi/basic_communication_system_request.cc +++ b/src/components/application_manager/src/commands/hmi/basic_communication_system_request.cc @@ -31,18 +31,16 @@ */ #include "application_manager/commands/hmi/basic_communication_system_request.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { BasicCommunicationSystemRequest::BasicCommunicationSystemRequest( - const MessageSharedPtr& message): RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -BasicCommunicationSystemRequest::~BasicCommunicationSystemRequest() { -} +BasicCommunicationSystemRequest::~BasicCommunicationSystemRequest() {} void BasicCommunicationSystemRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +50,3 @@ void BasicCommunicationSystemRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/basic_communication_system_response.cc b/src/components/application_manager/src/commands/hmi/basic_communication_system_response.cc index 6106266d19..16afce92e0 100644 --- a/src/components/application_manager/src/commands/hmi/basic_communication_system_response.cc +++ b/src/components/application_manager/src/commands/hmi/basic_communication_system_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/basic_communication_system_response.h" #include "application_manager/event_engine/event.h" + #include "interfaces/HMI_API.h" namespace application_manager { @@ -38,17 +39,17 @@ namespace application_manager { namespace commands { BasicCommunicationSystemResponse::BasicCommunicationSystemResponse( - const MessageSharedPtr& message): ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -BasicCommunicationSystemResponse::~BasicCommunicationSystemResponse() { -} +BasicCommunicationSystemResponse::~BasicCommunicationSystemResponse() {} void BasicCommunicationSystemResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_SystemRequest); + event_engine::Event event( + hmi_apis::FunctionID::BasicCommunication_SystemRequest); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/button_get_capabilities_request.cc b/src/components/application_manager/src/commands/hmi/button_get_capabilities_request.cc index 87cf1aa783..e6b73879e5 100644 --- a/src/components/application_manager/src/commands/hmi/button_get_capabilities_request.cc +++ b/src/components/application_manager/src/commands/hmi/button_get_capabilities_request.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { ButtonGetCapabilitiesRequest::ButtonGetCapabilitiesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -ButtonGetCapabilitiesRequest::~ButtonGetCapabilitiesRequest() { -} +ButtonGetCapabilitiesRequest::~ButtonGetCapabilitiesRequest() {} void ButtonGetCapabilitiesRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -54,4 +52,3 @@ void ButtonGetCapabilitiesRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/button_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/button_get_capabilities_response.cc index bb04636aba..a947fb7ba9 100644 --- a/src/components/application_manager/src/commands/hmi/button_get_capabilities_response.cc +++ b/src/components/application_manager/src/commands/hmi/button_get_capabilities_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/button_get_capabilities_response.h" -#include "application_manager/application_manager_impl.h" + #include "utils/logger.h" namespace application_manager { @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { ButtonGetCapabilitiesResponse::ButtonGetCapabilitiesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -ButtonGetCapabilitiesResponse::~ButtonGetCapabilitiesResponse() { -} +ButtonGetCapabilitiesResponse::~ButtonGetCapabilitiesResponse() {} void ButtonGetCapabilitiesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -56,8 +54,7 @@ void ButtonGetCapabilitiesResponse::Run() { return; } - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_button_capabilities( (*message_)[strings::msg_params][hmi_response::capabilities]); diff --git a/src/components/application_manager/src/commands/hmi/close_popup_request.cc b/src/components/application_manager/src/commands/hmi/close_popup_request.cc index 352a281348..b0ab48dd96 100644 --- a/src/components/application_manager/src/commands/hmi/close_popup_request.cc +++ b/src/components/application_manager/src/commands/hmi/close_popup_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -ClosePopupRequest::ClosePopupRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +ClosePopupRequest::ClosePopupRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -ClosePopupRequest::~ClosePopupRequest() { -} +ClosePopupRequest::~ClosePopupRequest() {} void ClosePopupRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void ClosePopupRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/close_popup_response.cc b/src/components/application_manager/src/commands/hmi/close_popup_response.cc index 078d24ef2d..15adb2ee32 100644 --- a/src/components/application_manager/src/commands/hmi/close_popup_response.cc +++ b/src/components/application_manager/src/commands/hmi/close_popup_response.cc @@ -35,12 +35,11 @@ namespace application_manager { namespace commands { -ClosePopupResponse::ClosePopupResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +ClosePopupResponse::ClosePopupResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -ClosePopupResponse::~ClosePopupResponse() { -} +ClosePopupResponse::~ClosePopupResponse() {} void ClosePopupResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); diff --git a/src/components/application_manager/src/commands/hmi/dial_number_request.cc b/src/components/application_manager/src/commands/hmi/dial_number_request.cc index 0e8e359e7e..b26541cb01 100644 --- a/src/components/application_manager/src/commands/hmi/dial_number_request.cc +++ b/src/components/application_manager/src/commands/hmi/dial_number_request.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Ford Motor Company + * Copyright (c) 2013, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,20 +38,18 @@ namespace commands { namespace hmi { -DialNumberRequest::DialNumberRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +DialNumberRequest::DialNumberRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -DialNumberRequest::~DialNumberRequest() { -} +DialNumberRequest::~DialNumberRequest() {} void DialNumberRequest::Run() { SendRequest(); } -} // namespace hmi +} // namespace hmi } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/dial_number_response.cc b/src/components/application_manager/src/commands/hmi/dial_number_response.cc index 3f616bf47f..5511fa98f8 100644 --- a/src/components/application_manager/src/commands/hmi/dial_number_response.cc +++ b/src/components/application_manager/src/commands/hmi/dial_number_response.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Ford Motor Company + * Copyright (c) 2013, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,20 +37,20 @@ namespace commands { namespace hmi { -DialNumberResponse::DialNumberResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +DialNumberResponse::DialNumberResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -DialNumberResponse::~DialNumberResponse() { -} +DialNumberResponse::~DialNumberResponse() {} void DialNumberResponse::Run() { - event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_DialNumber); + event_engine::Event event( + hmi_apis::FunctionID::BasicCommunication_DialNumber); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } -} // namespace hmi +} // namespace hmi } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/get_system_info_request.cc b/src/components/application_manager/src/commands/hmi/get_system_info_request.cc index 9024331462..379027c43a 100644 --- a/src/components/application_manager/src/commands/hmi/get_system_info_request.cc +++ b/src/components/application_manager/src/commands/hmi/get_system_info_request.cc @@ -31,29 +31,25 @@ */ #include "application_manager/commands/hmi/get_system_info_request.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { GetSystemInfoRequest::GetSystemInfoRequest( - const MessageSharedPtr& message): RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -GetSystemInfoRequest::~GetSystemInfoRequest() { -} +GetSystemInfoRequest::~GetSystemInfoRequest() {} void GetSystemInfoRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); uint32_t correlation_id = RequestToHMI::correlation_id(); uint32_t app_id = RequestToHMI::application_id(); - ApplicationManagerImpl::instance()->set_application_id(correlation_id, app_id); + application_manager_.set_application_id(correlation_id, app_id); SendRequest(); } } // namespace commands } // namespace application_manager - - diff --git a/src/components/application_manager/src/commands/hmi/get_system_info_response.cc b/src/components/application_manager/src/commands/hmi/get_system_info_response.cc index 5b1ec94e9d..be6dabb292 100644 --- a/src/components/application_manager/src/commands/hmi/get_system_info_response.cc +++ b/src/components/application_manager/src/commands/hmi/get_system_info_response.cc @@ -30,20 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/get_system_info_response.h" -#include "application_manager/application_manager_impl.h" -#include "application_manager/policies/policy_handler.h" #include "application_manager/message_helper.h" namespace application_manager { - namespace commands { GetSystemInfoResponse::GetSystemInfoResponse( - const MessageSharedPtr& message): ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -GetSystemInfoResponse::~GetSystemInfoResponse() { -} +GetSystemInfoResponse::~GetSystemInfoResponse() {} void GetSystemInfoResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -51,39 +47,36 @@ void GetSystemInfoResponse::Run() { static_cast<hmi_apis::Common_Result::eType>( (*message_)[strings::params][hmi_response::code].asInt()); - std::string ccpu_version; - std::string wers_country_code; - std::string language; + const SystemInfo& info = GetSystemInfo(code); - if (hmi_apis::Common_Result::SUCCESS == code) { - ccpu_version = - (*message_)[strings::msg_params]["ccpu_version"].asString(); - wers_country_code = - (*message_)[strings::msg_params]["wersCountryCode"].asString(); - uint32_t lang_code = (*message_)[strings::msg_params]["language"].asUInt(); - language = application_manager::MessageHelper::CommonLanguageToString( - static_cast<hmi_apis::Common_Language::eType>(lang_code)); + // We have to set preloaded flag as false in policy table on any response + // of GetSystemInfo (SDLAQ-CRS-2365) + application_manager_.GetPolicyHandler().OnGetSystemInfo( + info.ccpu_version, info.wers_country_code, info.language); +} - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); - hmi_capabilities.set_ccpu_version(ccpu_version); - } else { - LOG4CXX_WARN(logger_, "GetSystemError returns an error code " << code); +const SystemInfo GetSystemInfoResponse::GetSystemInfo( + const hmi_apis::Common_Result::eType code) const { + SystemInfo info; - // We have to set preloaded flag as false in policy table on any response - // of GetSystemInfo (SDLAQ-CRS-2365) - const std::string empty_value; - policy::PolicyHandler::instance()->OnGetSystemInfo(empty_value, - empty_value, - empty_value); - return; + if (hmi_apis::Common_Result::SUCCESS != code) { + LOG4CXX_WARN(logger_, "GetSystemError returns an error code " << code); + return info; } + info.ccpu_version = + (*message_)[strings::msg_params]["ccpu_version"].asString(); - // We have to set preloaded flag as false in policy table on any response - // of GetSystemInfo (SDLAQ-CRS-2365) - policy::PolicyHandler::instance()->OnGetSystemInfo(ccpu_version, - wers_country_code, - language); + info.wers_country_code = + (*message_)[strings::msg_params]["wersCountryCode"].asString(); + + const uint32_t lang_code = + (*message_)[strings::msg_params]["language"].asUInt(); + info.language = application_manager::MessageHelper::CommonLanguageToString( + static_cast<hmi_apis::Common_Language::eType>(lang_code)); + + application_manager_.hmi_capabilities().set_ccpu_version(info.ccpu_version); + + return info; } } // 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 1c7d9f57c1..af220051d4 100644 --- a/src/components/application_manager/src/commands/hmi/get_urls.cc +++ b/src/components/application_manager/src/commands/hmi/get_urls.cc @@ -32,13 +32,27 @@ #include "application_manager/commands/hmi/get_urls.h" #include "application_manager/message.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" #include "application_manager/policies/policy_handler.h" +namespace { +struct PolicyAppIdComparator { + PolicyAppIdComparator(const std::string& policy_app_id) + : policy_app_id_(policy_app_id) {} + + bool operator()(const policy::EndpointData& data) { + return data.app_id == policy_app_id_; + } + std::string policy_app_id_; +}; +} + namespace application_manager { namespace commands { -GetUrls::GetUrls(const MessageSharedPtr& message) : RequestFromHMI(message) {} +GetUrls::GetUrls(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestFromHMI(message, application_manager) {} GetUrls::~GetUrls() {} @@ -49,7 +63,7 @@ void GetUrls::Run() { using namespace strings; using namespace hmi_apis; - if (!policy::PolicyHandler::instance()->PolicyEnabled()) { + if (!application_manager_.GetPolicyHandler().PolicyEnabled()) { SendResponseToHMI(Common_Result::DATA_NOT_AVAILABLE); return; } @@ -59,9 +73,8 @@ void GetUrls::Run() { object[msg_params][hmi_request::service].asString(); policy::EndpointUrls endpoints; - policy::PolicyHandler::instance()->GetServiceUrls( - object[strings::msg_params][hmi_request::service].asString(), - endpoints); + application_manager_.GetPolicyHandler().GetServiceUrls( + object[strings::msg_params][hmi_request::service].asString(), endpoints); if (endpoints.empty()) { LOG4CXX_ERROR(logger_, "No URLs for service " << service_to_check); SendResponseToHMI(Common_Result::DATA_NOT_AVAILABLE); @@ -88,22 +101,29 @@ void GetUrls::ProcessPolicyServiceURLs(const policy::EndpointUrls& endpoints) { using namespace hmi_apis; const uint32_t app_id_to_send_to = - policy::PolicyHandler::instance()->GetAppIdForSending(); + application_manager_.GetPolicyHandler().GetAppIdForSending(); if (!app_id_to_send_to) { LOG4CXX_ERROR(logger_, "There are no available applications for processing."); - ApplicationManagerImpl::instance()->ManageHMICommand(message_); + SmartObject urls(SmartType_Array); + FillSODefaultUrls(urls, endpoints); + if (!urls.empty()) { + (*message_)[msg_params][hmi_response::urls] = urls; + } + (*message_).erase(hmi_request::service); + SendResponseToHMI(Common_Result::SUCCESS); return; } ApplicationSharedPtr app = - ApplicationManagerImpl::instance()->application(app_id_to_send_to); + application_manager_.application(app_id_to_send_to); if (!app.valid()) { LOG4CXX_WARN(logger_, "There is no registered application with " - "connection key '" << app_id_to_send_to << "'"); + "connection key '" + << app_id_to_send_to << "'"); SendResponseToHMI(Common_Result::DATA_NOT_AVAILABLE); return; } @@ -111,10 +131,8 @@ void GetUrls::ProcessPolicyServiceURLs(const policy::EndpointUrls& endpoints) { SmartObject& object = *message_; object[msg_params].erase(hmi_request::service); object[msg_params][hmi_response::urls] = SmartObject(SmartType_Array); - SmartObject& urls = object[msg_params][hmi_response::urls]; - - const std::string mobile_app_id = app->mobile_app_id(); + const std::string mobile_app_id = app->policy_app_id(); std::string default_url = "URL is not found"; // Will use only one URL for particular application if it will be found @@ -122,7 +140,6 @@ void GetUrls::ProcessPolicyServiceURLs(const policy::EndpointUrls& endpoints) { SmartObject service_info = SmartObject(SmartType_Map); for (size_t e = 0; e < endpoints.size(); ++e) { - if (mobile_app_id == endpoints[e].app_id) { if (endpoints[e].url.size()) { service_info[url] = endpoints[e].url[0]; @@ -175,10 +192,27 @@ void GetUrls::ProcessServiceURLs(const policy::EndpointUrls& endpoints) { SendResponseToHMI(Common_Result::SUCCESS); } +void GetUrls::FillSODefaultUrls(smart_objects::SmartObject& urls, + const policy::EndpointUrls& endpoints) { + using namespace smart_objects; + LOG4CXX_AUTO_TRACE(logger_); + PolicyAppIdComparator comparator(policy::kDefaultId); + policy::EndpointUrls::const_iterator it = + std::find_if(endpoints.begin(), endpoints.end(), comparator); + if (it == endpoints.end()) { + return; + } + SmartObject service_info = SmartObject(SmartType_Map); + for (size_t i = 0; i < (*it).url.size(); ++i) { + service_info[strings::url] = (*it).url[i]; + urls[i] = service_info; + } +} + void GetUrls::SendResponseToHMI(hmi_apis::Common_Result::eType result) { (*message_)[strings::params][strings::message_type] = MessageType::kResponse; (*message_)[strings::params][hmi_response::code] = result; - ApplicationManagerImpl::instance()->ManageHMICommand(message_); + application_manager_.ManageHMICommand(message_); } } // namespace commands 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 b446f088bf..dd9686fbce 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,24 +31,22 @@ */ #include "application_manager/commands/hmi/get_urls_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { -GetUrlsResponse::GetUrlsResponse( - const MessageSharedPtr& message): ResponseToHMI(message) { -} +GetUrlsResponse::GetUrlsResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseToHMI(message, application_manager) {} -GetUrlsResponse::~GetUrlsResponse() { -} +GetUrlsResponse::~GetUrlsResponse() {} void GetUrlsResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - ApplicationManagerImpl::instance()->SendMessageToHMI(message_); + application_manager_.SendMessageToHMI(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/mixing_audio_supported_request.cc b/src/components/application_manager/src/commands/hmi/mixing_audio_supported_request.cc index 059843355c..e38d1fc088 100644 --- a/src/components/application_manager/src/commands/hmi/mixing_audio_supported_request.cc +++ b/src/components/application_manager/src/commands/hmi/mixing_audio_supported_request.cc @@ -37,11 +37,10 @@ namespace application_manager { namespace commands { MixingAudioSupportedRequest::MixingAudioSupportedRequest( - const MessageSharedPtr& message) : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -MixingAudioSupportedRequest::~MixingAudioSupportedRequest() { -} +MixingAudioSupportedRequest::~MixingAudioSupportedRequest() {} void MixingAudioSupportedRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void MixingAudioSupportedRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/mixing_audio_supported_response.cc b/src/components/application_manager/src/commands/hmi/mixing_audio_supported_response.cc index 2da8bdc453..f8b58e6f35 100644 --- a/src/components/application_manager/src/commands/hmi/mixing_audio_supported_response.cc +++ b/src/components/application_manager/src/commands/hmi/mixing_audio_supported_response.cc @@ -30,26 +30,24 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/mixing_audio_supported_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { MixingAudioSupportedResponse::MixingAudioSupportedResponse( - const MessageSharedPtr& message) : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -MixingAudioSupportedResponse::~MixingAudioSupportedResponse() { -} +MixingAudioSupportedResponse::~MixingAudioSupportedResponse() {} void MixingAudioSupportedResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); - hmi_capabilities.set_attenuated_supported((*message_) - [strings::msg_params][hmi_response::attenuated_supported].asBool()); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); + hmi_capabilities.set_attenuated_supported( + (*message_)[strings::msg_params][hmi_response::attenuated_supported] + .asBool()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_request.cc b/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_request.cc index 77b3701904..582caaa8f3 100644 --- a/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_request.cc @@ -37,11 +37,10 @@ namespace application_manager { namespace commands { NaviAlertManeuverRequest::NaviAlertManeuverRequest( - const MessageSharedPtr& message) : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -NaviAlertManeuverRequest::~NaviAlertManeuverRequest() { -} +NaviAlertManeuverRequest::~NaviAlertManeuverRequest() {} void NaviAlertManeuverRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void NaviAlertManeuverRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_response.cc b/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_response.cc index 49d659777b..5f0422bf6a 100644 --- a/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_alert_maneuver_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/navi_alert_maneuver_response.h" #include "application_manager/event_engine/event.h" + #include "interfaces/HMI_API.h" namespace application_manager { @@ -38,18 +39,17 @@ namespace application_manager { namespace commands { NaviAlertManeuverResponse::NaviAlertManeuverResponse( - const MessageSharedPtr& message) : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -NaviAlertManeuverResponse::~NaviAlertManeuverResponse() { -} +NaviAlertManeuverResponse::~NaviAlertManeuverResponse() {} void NaviAlertManeuverResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::Navigation_AlertManeuver); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc index 4a637341c1..920c6fbdf9 100644 --- a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_request.cc @@ -31,67 +31,30 @@ */ #include "application_manager/commands/hmi/navi_audio_start_stream_request.h" -#include "application_manager/application_manager_impl.h" + +#include "application_manager/message_helper.h" #include "protocol_handler/protocol_handler.h" -#include "config_profile/profile.h" namespace application_manager { namespace commands { AudioStartStreamRequest::AudioStartStreamRequest( - const MessageSharedPtr& message) - : RequestToHMI(message), - retry_number_(0) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) + , EventObserver(application_manager.event_dispatcher()) + , retry_number_(0) { LOG4CXX_AUTO_TRACE(logger_); std::pair<uint32_t, int32_t> stream_retry = - profile::Profile::instance()->start_stream_retry_amount(); + application_manager_.get_settings().start_stream_retry_amount(); default_timeout_ = stream_retry.second; retry_number_ = stream_retry.first; - LOG4CXX_DEBUG(logger_, "default_timeout_ = " << default_timeout_ - <<"; retry_number_ = " << retry_number_); -} - -AudioStartStreamRequest::~AudioStartStreamRequest() { -} - -void AudioStartStreamRequest::RetryStartSession() { - LOG4CXX_AUTO_TRACE(logger_); - - ApplicationSharedPtr app = ApplicationManagerImpl::instance()-> - application_by_hmi_app(application_id()); - if (!app) { - LOG4CXX_ERROR(logger_, - "StartAudioStreamRequest aborted. Application not found"); - return; - } - if (app->audio_streaming_approved()) { - LOG4CXX_DEBUG(logger_, "AudioStartStream retry sequence stopped. " - << "SUCCESS received"); - app->set_audio_stream_retry_number(0); - return; - } - - uint32_t curr_retry_number = app->audio_stream_retry_number(); - if (curr_retry_number < retry_number_ - 1) { - LOG4CXX_DEBUG(logger_, "Send AudioStartStream retry. retry_number = " - << curr_retry_number); - MessageHelper::SendAudioStartStream(app->app_id()); - app->set_audio_stream_retry_number(++curr_retry_number); - } else { - LOG4CXX_DEBUG(logger_, "Audio start stream retry sequence stopped. " - << "Attempts expired."); - app->set_audio_stream_retry_number(0); - ApplicationManagerImpl::instance()->EndNaviServices(app->app_id()); - } + LOG4CXX_DEBUG(logger_, + "default_timeout_ = " << default_timeout_ + << "; retry_number_ = " << retry_number_); } -void AudioStartStreamRequest::onTimeOut() { - RetryStartSession(); - - ApplicationManagerImpl::instance()->TerminateRequest( - connection_key(), correlation_id()); -} +AudioStartStreamRequest::~AudioStartStreamRequest() {} void AudioStartStreamRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -100,14 +63,15 @@ void AudioStartStreamRequest::Run() { subscribe_on_event(hmi_apis::FunctionID::Navigation_StartAudioStream, correlation_id()); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()-> - application_by_hmi_app(application_id()); + ApplicationSharedPtr app = + application_manager_.application_by_hmi_app(application_id()); if (app) { app->set_audio_streaming_allowed(true); SendRequest(); } else { - LOG4CXX_ERROR(logger_, "Applcation with hmi_app_id " - << application_id() << " does not exist"); + LOG4CXX_ERROR(logger_, + "Applcation with hmi_app_id " << application_id() + << " does not exist"); } } @@ -115,11 +79,11 @@ void AudioStartStreamRequest::on_event(const event_engine::Event& event) { using namespace protocol_handler; LOG4CXX_AUTO_TRACE(logger_); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()-> - application_by_hmi_app(application_id()); + ApplicationSharedPtr app = + application_manager_.application_by_hmi_app(application_id()); if (!app) { LOG4CXX_ERROR(logger_, - "StartAudioStreamRequest aborted. Application not found"); + "StartAudioStreamRequest aborted. Application not found"); return; } @@ -133,24 +97,76 @@ void AudioStartStreamRequest::on_event(const event_engine::Event& event) { message[strings::params][hmi_response::code].asInt()); if (hmi_apis::Common_Result::SUCCESS == code) { - LOG4CXX_DEBUG(logger_, "StartAudioStreamResponse SUCCESS"); - if (ApplicationManagerImpl::instance()-> - HMILevelAllowsStreaming(app->app_id(), ServiceType::kAudio)) { + LOG4CXX_INFO(logger_, "StartAudioStream response SUCCESS"); + if (application_manager_.HMILevelAllowsStreaming(app->app_id(), + ServiceType::kAudio)) { app->set_audio_streaming_approved(true); } else { - LOG4CXX_DEBUG(logger_, - "StartAudioStreamRequest aborted. Application can not stream"); + LOG4CXX_WARN( + logger_, + "StartAudioStreamRequest aborted. Application can not stream"); } + break; + } + if (hmi_apis::Common_Result::REJECTED == code) { + LOG4CXX_INFO(logger_, "StartAudioStream response REJECTED"); + RetryStartSession(); + break; } - break; } default: { - LOG4CXX_ERROR(logger_,"Received unknown event" << event.id()); + LOG4CXX_ERROR(logger_, "Received unknown event" << event.id()); return; } } } +void AudioStartStreamRequest::onTimeOut() { + RetryStartSession(); + + application_manager_.TerminateRequest(connection_key(), correlation_id()); +} + +void AudioStartStreamRequest::RetryStartSession() { + LOG4CXX_AUTO_TRACE(logger_); + + ApplicationSharedPtr app = + application_manager_.application_by_hmi_app(application_id()); + if (!app) { + LOG4CXX_ERROR(logger_, + "StartAudioStreamRequest aborted. Application not found"); + return; + } + + if (!app->audio_streaming_allowed()) { + LOG4CXX_WARN(logger_, "Audio streaming not allowed"); + return; + } + + if (app->audio_streaming_approved()) { + LOG4CXX_INFO(logger_, + "AudioStartStream retry sequence stopped. " + << "SUCCESS received"); + app->set_audio_stream_retry_number(0); + return; + } + + uint32_t curr_retry_number = app->audio_stream_retry_number(); + if (curr_retry_number < retry_number_ - 1) { + LOG4CXX_DEBUG( + logger_, + "Send AudioStartStream retry. retry_number = " << curr_retry_number); + MessageHelper::SendAudioStartStream(app->app_id(), application_manager_); + app->set_audio_stream_retry_number(++curr_retry_number); + } else { + LOG4CXX_DEBUG(logger_, + "Audio start stream retry sequence stopped. " + << "Attempts expired."); + + application_manager_.EndNaviServices(app->app_id()); + } +} + } // namespace commands } // namespace application_manager diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_response.cc b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_response.cc index 5547057a1f..c7fc7365e7 100644 --- a/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_audio_start_stream_response.cc @@ -35,19 +35,18 @@ namespace application_manager { namespace commands { -AudioStartStreamResponse::AudioStartStreamResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +AudioStartStreamResponse::AudioStartStreamResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -AudioStartStreamResponse::~AudioStartStreamResponse() { -} +AudioStartStreamResponse::~AudioStartStreamResponse() {} void AudioStartStreamResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::Navigation_StartAudioStream); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_request.cc index ea00d5bc3b..d0f1a96282 100644 --- a/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_request.cc @@ -36,12 +36,10 @@ namespace application_manager { namespace commands { AudioStopStreamRequest::AudioStopStreamRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -AudioStopStreamRequest::~AudioStopStreamRequest() { -} +AudioStopStreamRequest::~AudioStopStreamRequest() {} void AudioStopStreamRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); diff --git a/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_response.cc b/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_response.cc index 29e6708e19..c669d399f9 100644 --- a/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_audio_stop_stream_response.cc @@ -35,16 +35,14 @@ namespace application_manager { namespace commands { -AudioStopStreamResponse::AudioStopStreamResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +AudioStopStreamResponse::AudioStopStreamResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -AudioStopStreamResponse::~AudioStopStreamResponse() { -} +AudioStopStreamResponse::~AudioStopStreamResponse() {} void AudioStopStreamResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/on_play_tone_notification.cc b/src/components/application_manager/src/commands/hmi/navi_get_way_points_request.cc index 9820bb02ad..51f862c957 100644 --- a/src/components/application_manager/src/commands/hmi/on_play_tone_notification.cc +++ b/src/components/application_manager/src/commands/hmi/navi_get_way_points_request.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,26 +30,24 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_play_tone_notification.h" +#include "application_manager/commands/hmi/navi_get_way_points_request.h" namespace application_manager { namespace commands { -OnPlayToneNotification::OnPlayToneNotification(const MessageSharedPtr& message) - : NotificationToHMI(message) { -} +NaviGetWayPointsRequest::NaviGetWayPointsRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -OnPlayToneNotification::~OnPlayToneNotification() { -} +NaviGetWayPointsRequest::~NaviGetWayPointsRequest() {} -void OnPlayToneNotification::Run() { +void NaviGetWayPointsRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - SendNotification(); + SendRequest(); } } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_set_icon_response.cc b/src/components/application_manager/src/commands/hmi/navi_get_way_points_response.cc index f4565baaf1..f295845b24 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_icon_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_get_way_points_response.cc @@ -1,5 +1,5 @@ -/** - * Copyright (c) 2013, Ford Motor Company +/* + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/ui_set_icon_response.h" + +#include "application_manager/commands/hmi/navi_get_way_points_response.h" #include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" @@ -37,19 +38,18 @@ namespace application_manager { namespace commands { -UISetIconResponse::UISetIconResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +NaviGetWayPointsResponse::NaviGetWayPointsResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UISetIconResponse::~UISetIconResponse() { -} +NaviGetWayPointsResponse::~NaviGetWayPointsResponse() {} -void UISetIconResponse::Run() { - LOG4CXX_INFO(logger_, "UISetIconResponse::Run"); +void NaviGetWayPointsResponse::Run() { + LOG4CXX_AUTO_TRACE(logger_); - event_engine::Event event(hmi_apis::FunctionID::UI_SetAppIcon); + event_engine::Event event(hmi_apis::FunctionID::Navigation_GetWayPoints); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/navi_is_ready_request.cc b/src/components/application_manager/src/commands/hmi/navi_is_ready_request.cc index 4c00908781..92e972e8f4 100644 --- a/src/components/application_manager/src/commands/hmi/navi_is_ready_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_is_ready_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -NaviIsReadyRequest::NaviIsReadyRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +NaviIsReadyRequest::NaviIsReadyRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -NaviIsReadyRequest::~NaviIsReadyRequest() { -} +NaviIsReadyRequest::~NaviIsReadyRequest() {} void NaviIsReadyRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void NaviIsReadyRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/navi_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/navi_is_ready_response.cc index a3387aec33..129900c60f 100644 --- a/src/components/application_manager/src/commands/hmi/navi_is_ready_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_is_ready_response.cc @@ -30,18 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/navi_is_ready_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { -NaviIsReadyResponse::NaviIsReadyResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +NaviIsReadyResponse::NaviIsReadyResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -NaviIsReadyResponse::~NaviIsReadyResponse() { -} +NaviIsReadyResponse::~NaviIsReadyResponse() {} void NaviIsReadyResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,8 +50,7 @@ void NaviIsReadyResponse::Run() { is_available = object[strings::msg_params][strings::available].asBool(); } - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_is_navi_cooperating(is_available); } diff --git a/src/components/application_manager/src/commands/hmi/navi_send_location_request.cc b/src/components/application_manager/src/commands/hmi/navi_send_location_request.cc index 94d569c4ef..ad878033ca 100644 --- a/src/components/application_manager/src/commands/hmi/navi_send_location_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_send_location_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -NaviSendLocationRequest::NaviSendLocationRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +NaviSendLocationRequest::NaviSendLocationRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -NaviSendLocationRequest::~NaviSendLocationRequest() { -} +NaviSendLocationRequest::~NaviSendLocationRequest() {} void NaviSendLocationRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void NaviSendLocationRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/navi_send_location_response.cc b/src/components/application_manager/src/commands/hmi/navi_send_location_response.cc index 7ec5a5907d..a3d9f4c9e5 100644 --- a/src/components/application_manager/src/commands/hmi/navi_send_location_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_send_location_response.cc @@ -36,19 +36,18 @@ namespace application_manager { namespace commands { -NaviSendLocationResponse::NaviSendLocationResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +NaviSendLocationResponse::NaviSendLocationResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -NaviSendLocationResponse::~NaviSendLocationResponse() { -} +NaviSendLocationResponse::~NaviSendLocationResponse() {} void NaviSendLocationResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::Navigation_SendLocation); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_request.cc b/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_request.cc index b477dc8dab..a92ef07d12 100644 --- a/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_request.cc @@ -37,11 +37,10 @@ namespace application_manager { namespace commands { NaviShowConstantTBTRequest::NaviShowConstantTBTRequest( - const MessageSharedPtr& message) : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -NaviShowConstantTBTRequest::~NaviShowConstantTBTRequest() { -} +NaviShowConstantTBTRequest::~NaviShowConstantTBTRequest() {} void NaviShowConstantTBTRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void NaviShowConstantTBTRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_response.cc b/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_response.cc index 58878a3c0c..ede3272e8e 100644 --- a/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_show_constant_tbt_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/navi_show_constant_tbt_response.h" #include "application_manager/event_engine/event.h" + #include "interfaces/HMI_API.h" namespace application_manager { @@ -38,18 +39,17 @@ namespace application_manager { namespace commands { NaviShowConstantTBTResponse::NaviShowConstantTBTResponse( - const MessageSharedPtr& message) : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -NaviShowConstantTBTResponse::~NaviShowConstantTBTResponse() { -} +NaviShowConstantTBTResponse::~NaviShowConstantTBTResponse() {} void NaviShowConstantTBTResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::Navigation_ShowConstantTBT); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc index 1ff7916b9a..f0104cbaee 100644 --- a/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_start_stream_request.cc @@ -31,29 +31,30 @@ */ #include "application_manager/commands/hmi/navi_start_stream_request.h" -#include "application_manager/application_manager_impl.h" + +#include "application_manager/message_helper.h" #include "protocol_handler/protocol_handler.h" -#include "config_profile/profile.h" namespace application_manager { namespace commands { NaviStartStreamRequest::NaviStartStreamRequest( - const MessageSharedPtr& message) - : RequestToHMI(message), - retry_number_(0) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) + , EventObserver(application_manager.event_dispatcher()) + , retry_number_(0) { LOG4CXX_AUTO_TRACE(logger_); std::pair<uint32_t, int32_t> stream_retry = - profile::Profile::instance()->start_stream_retry_amount(); + application_manager_.get_settings().start_stream_retry_amount(); default_timeout_ = stream_retry.second; retry_number_ = stream_retry.first; - LOG4CXX_DEBUG(logger_, "default_timeout_ = " << default_timeout_ - <<"; retry_number_ = " << retry_number_); + LOG4CXX_DEBUG(logger_, + "default_timeout_ = " << default_timeout_ + << "; retry_number_ = " << retry_number_); } -NaviStartStreamRequest::~NaviStartStreamRequest() { -} +NaviStartStreamRequest::~NaviStartStreamRequest() {} void NaviStartStreamRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -62,14 +63,15 @@ void NaviStartStreamRequest::Run() { subscribe_on_event(hmi_apis::FunctionID::Navigation_StartStream, correlation_id()); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()-> - application_by_hmi_app(application_id()); + ApplicationSharedPtr app = + application_manager_.application_by_hmi_app(application_id()); if (app) { app->set_video_streaming_allowed(true); SendRequest(); } else { - LOG4CXX_ERROR(logger_, "Applcation with hmi_app_id " - << application_id() << "does not exist"); + LOG4CXX_ERROR(logger_, + "Applcation with hmi_app_id " << application_id() + << "does not exist"); } } @@ -77,11 +79,11 @@ void NaviStartStreamRequest::on_event(const event_engine::Event& event) { using namespace protocol_handler; LOG4CXX_AUTO_TRACE(logger_); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()-> - application_by_hmi_app(application_id()); + ApplicationSharedPtr app = + application_manager_.application_by_hmi_app(application_id()); if (!app) { LOG4CXX_ERROR(logger_, - "NaviStartStreamRequest aborted. Application not found"); + "NaviStartStreamRequest aborted. Application not found"); return; } @@ -95,19 +97,25 @@ void NaviStartStreamRequest::on_event(const event_engine::Event& event) { message[strings::params][hmi_response::code].asInt()); if (hmi_apis::Common_Result::SUCCESS == code) { - LOG4CXX_DEBUG(logger_, "NaviStartStreamResponse SUCCESS"); - if (ApplicationManagerImpl::instance()-> - HMILevelAllowsStreaming(app->app_id(), ServiceType::kMobileNav)) { + LOG4CXX_INFO(logger_, "NaviStartStreamResponse SUCCESS"); + if (application_manager_.HMILevelAllowsStreaming( + app->app_id(), ServiceType::kMobileNav)) { app->set_video_streaming_approved(true); } else { - LOG4CXX_DEBUG(logger_, - "NaviStartStreamRequest aborted. Application can not stream"); + LOG4CXX_DEBUG( + logger_, + "NaviStartStreamRequest aborted. Application can not stream"); } + break; + } + if (hmi_apis::Common_Result::REJECTED == code) { + LOG4CXX_INFO(logger_, "StartStream response REJECTED "); + SendRequest(); + break; } - break; } default: { - LOG4CXX_ERROR(logger_,"Received unknown event" << event.id()); + LOG4CXX_ERROR(logger_, "Received unknown event" << event.id()); return; } } @@ -116,38 +124,46 @@ void NaviStartStreamRequest::on_event(const event_engine::Event& event) { void NaviStartStreamRequest::onTimeOut() { RetryStartSession(); - ApplicationManagerImpl::instance()->TerminateRequest( - connection_key(), correlation_id()); + application_manager_.TerminateRequest(connection_key(), correlation_id()); } void NaviStartStreamRequest::RetryStartSession() { LOG4CXX_AUTO_TRACE(logger_); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()-> - application_by_hmi_app(application_id()); + ApplicationSharedPtr app = + application_manager_.application_by_hmi_app(application_id()); if (!app) { LOG4CXX_ERROR(logger_, - "NaviStartStreamRequest aborted. Application not found"); + "NaviStartStreamRequest aborted. Application not found"); + return; + } + + if (!app->video_streaming_allowed()) { + LOG4CXX_WARN(logger_, "Video streaming not allowed"); return; } + if (app->video_streaming_approved()) { - LOG4CXX_DEBUG(logger_, "NaviStartStream retry sequence stopped. " - << "SUCCESS received"); + LOG4CXX_INFO(logger_, + "NaviStartStream retry sequence stopped. " + << "SUCCESS received"); app->set_video_stream_retry_number(0); return; } uint32_t curr_retry_number = app->video_stream_retry_number(); if (curr_retry_number < retry_number_ - 1) { - LOG4CXX_DEBUG(logger_, "Send NaviStartStream retry. retry_number = " - << curr_retry_number); - MessageHelper::SendNaviStartStream(app->app_id()); + LOG4CXX_DEBUG( + logger_, + "Send NaviStartStream retry. retry_number = " << curr_retry_number); + MessageHelper::SendNaviStartStream(app->app_id(), application_manager_); app->set_video_stream_retry_number(++curr_retry_number); } else { - LOG4CXX_DEBUG(logger_, "NaviStartStream retry sequence stopped. " - << "Attempts expired"); - app->set_video_stream_retry_number(0); - ApplicationManagerImpl::instance()->EndNaviServices(app->app_id()); + LOG4CXX_DEBUG(logger_, + "NaviStartStream retry sequence stopped. " + << "Attempts expired"); + + application_manager_.EndNaviServices(app->app_id()); } } diff --git a/src/components/application_manager/src/commands/hmi/navi_start_stream_response.cc b/src/components/application_manager/src/commands/hmi/navi_start_stream_response.cc index a283891054..b0b9e672c3 100644 --- a/src/components/application_manager/src/commands/hmi/navi_start_stream_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_start_stream_response.cc @@ -35,19 +35,18 @@ namespace application_manager { namespace commands { -NaviStartStreamResponse::NaviStartStreamResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +NaviStartStreamResponse::NaviStartStreamResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -NaviStartStreamResponse::~NaviStartStreamResponse() { -} +NaviStartStreamResponse::~NaviStartStreamResponse() {} void NaviStartStreamResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::Navigation_StartStream); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/navi_stop_stream_request.cc b/src/components/application_manager/src/commands/hmi/navi_stop_stream_request.cc index 3d74c27535..4b72ff28b4 100644 --- a/src/components/application_manager/src/commands/hmi/navi_stop_stream_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_stop_stream_request.cc @@ -5,12 +5,10 @@ namespace application_manager { namespace commands { NaviStopStreamRequest::NaviStopStreamRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -NaviStopStreamRequest::~NaviStopStreamRequest() { -} +NaviStopStreamRequest::~NaviStopStreamRequest() {} void NaviStopStreamRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); diff --git a/src/components/application_manager/src/commands/hmi/navi_stop_stream_response.cc b/src/components/application_manager/src/commands/hmi/navi_stop_stream_response.cc index 0603df6a65..3a7fc75260 100644 --- a/src/components/application_manager/src/commands/hmi/navi_stop_stream_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_stop_stream_response.cc @@ -35,16 +35,14 @@ namespace application_manager { namespace commands { -NaviStopStreamResponse::NaviStopStreamResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +NaviStopStreamResponse::NaviStopStreamResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -NaviStopStreamResponse::~NaviStopStreamResponse() { -} +NaviStopStreamResponse::~NaviStopStreamResponse() {} void NaviStopStreamResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/navi_subscribe_way_points_request.cc b/src/components/application_manager/src/commands/hmi/navi_subscribe_way_points_request.cc new file mode 100644 index 0000000000..f2106c8724 --- /dev/null +++ b/src/components/application_manager/src/commands/hmi/navi_subscribe_way_points_request.cc @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2016, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "application_manager/commands/hmi/navi_subscribe_way_points_request.h" + +namespace application_manager { + +namespace commands { + +NaviSubscribeWayPointsRequest::NaviSubscribeWayPointsRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} + +NaviSubscribeWayPointsRequest::~NaviSubscribeWayPointsRequest() {} + +void NaviSubscribeWayPointsRequest::Run() { + LOG4CXX_AUTO_TRACE(logger_); + + SendRequest(); +} + +} // namespace commands + +} // namespace application_manager diff --git a/src/components/application_manager/src/commands/hmi/on_phone_call_notification.cc b/src/components/application_manager/src/commands/hmi/navi_subscribe_way_points_response.cc index 5f47c2908a..f641051560 100644 --- a/src/components/application_manager/src/commands/hmi/on_phone_call_notification.cc +++ b/src/components/application_manager/src/commands/hmi/navi_subscribe_way_points_response.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,35 +30,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_phone_call_notification.h" -#include "application_manager/application_manager_impl.h" -#include "application_manager/application_impl.h" -#include "application_manager/message_helper.h" +#include "application_manager/commands/hmi/navi_subscribe_way_points_response.h" +#include "application_manager/event_engine/event.h" +#include "interfaces/HMI_API.h" namespace application_manager { namespace commands { -namespace hmi { +NaviSubscribeWayPointsResponse::NaviSubscribeWayPointsResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -OnPhoneCallNotification::OnPhoneCallNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} - -OnPhoneCallNotification::~OnPhoneCallNotification() { -} +NaviSubscribeWayPointsResponse::~NaviSubscribeWayPointsResponse() {} -void OnPhoneCallNotification::Run() { +void NaviSubscribeWayPointsResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_OnPhoneCall); + + event_engine::Event event( + hmi_apis::FunctionID::Navigation_SubscribeWayPoints); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } -} // namespace hmi - } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/navi_unsubscribe_way_points_request.cc b/src/components/application_manager/src/commands/hmi/navi_unsubscribe_way_points_request.cc new file mode 100644 index 0000000000..e66069feef --- /dev/null +++ b/src/components/application_manager/src/commands/hmi/navi_unsubscribe_way_points_request.cc @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2016, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "application_manager/commands/hmi/navi_unsubscribe_way_points_request.h" + +namespace application_manager { + +namespace commands { + +NaviUnSubscribeWayPointsRequest::NaviUnSubscribeWayPointsRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} + +NaviUnSubscribeWayPointsRequest::~NaviUnSubscribeWayPointsRequest() {} + +void NaviUnSubscribeWayPointsRequest::Run() { + LOG4CXX_AUTO_TRACE(logger_); + + SendRequest(); +} + +} // namespace commands + +} // namespace application_manager diff --git a/src/components/application_manager/src/commands/hmi/navi_unsubscribe_way_points_response.cc b/src/components/application_manager/src/commands/hmi/navi_unsubscribe_way_points_response.cc new file mode 100644 index 0000000000..61216321e8 --- /dev/null +++ b/src/components/application_manager/src/commands/hmi/navi_unsubscribe_way_points_response.cc @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2016, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "application_manager/commands/hmi/navi_unsubscribe_way_points_response.h" +#include "application_manager/event_engine/event.h" +#include "interfaces/MOBILE_API.h" +#include "interfaces/HMI_API.h" + +namespace application_manager { + +namespace commands { + +NaviUnsubscribeWayPointsResponse::NaviUnsubscribeWayPointsResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} + +NaviUnsubscribeWayPointsResponse::~NaviUnsubscribeWayPointsResponse() {} + +void NaviUnsubscribeWayPointsResponse::Run() { + LOG4CXX_AUTO_TRACE(logger_); + + event_engine::Event event( + hmi_apis::FunctionID::Navigation_UnsubscribeWayPoints); + event.set_smart_object(*message_); + event.raise(application_manager_.event_dispatcher()); +} + +} // namespace commands + +} // namespace application_manager diff --git a/src/components/application_manager/src/commands/hmi/navi_update_turn_list_request.cc b/src/components/application_manager/src/commands/hmi/navi_update_turn_list_request.cc index 37037245fa..c37c3d12f9 100644 --- a/src/components/application_manager/src/commands/hmi/navi_update_turn_list_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_update_turn_list_request.cc @@ -37,11 +37,10 @@ namespace application_manager { namespace commands { NaviUpdateTurnListRequest::NaviUpdateTurnListRequest( - const MessageSharedPtr& message) : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -NaviUpdateTurnListRequest::~NaviUpdateTurnListRequest() { -} +NaviUpdateTurnListRequest::~NaviUpdateTurnListRequest() {} void NaviUpdateTurnListRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void NaviUpdateTurnListRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/navi_update_turn_list_response.cc b/src/components/application_manager/src/commands/hmi/navi_update_turn_list_response.cc index d196db93e9..faf5719d05 100644 --- a/src/components/application_manager/src/commands/hmi/navi_update_turn_list_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_update_turn_list_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/navi_update_turn_list_response.h" #include "application_manager/event_engine/event.h" + #include "interfaces/MOBILE_API.h" namespace application_manager { @@ -38,18 +39,17 @@ namespace application_manager { namespace commands { NaviUpdateTurnListResponse::NaviUpdateTurnListResponse( - const MessageSharedPtr& message) : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -NaviUpdateTurnListResponse::~NaviUpdateTurnListResponse() { -} +NaviUpdateTurnListResponse::~NaviUpdateTurnListResponse() {} void NaviUpdateTurnListResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::Navigation_UpdateTurnList); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // 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 9c483459e1..64eb63fde8 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 @@ -31,22 +31,21 @@ */ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" #include "smart_objects/smart_object.h" namespace application_manager { namespace commands { -NotificationFromHMI::NotificationFromHMI(const MessageSharedPtr& message) - : CommandImpl(message) { - +NotificationFromHMI::NotificationFromHMI( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : CommandImpl(message, application_manager) { // Replace HMI app id with Mobile connection id - ApplicationManagerImpl::instance()->ReplaceHMIByMobileAppId(*message); + ReplaceHMIByMobileAppId(*message); } -NotificationFromHMI::~NotificationFromHMI() { -} +NotificationFromHMI::~NotificationFromHMI() {} bool NotificationFromHMI::Init() { return true; @@ -56,21 +55,18 @@ bool NotificationFromHMI::CleanUp() { return true; } -void NotificationFromHMI::Run() { -} +void NotificationFromHMI::Run() {} void NotificationFromHMI::SendNotificationToMobile( const MessageSharedPtr& message) { - (*message)[strings::params][strings::message_type] = static_cast<int32_t>(application_manager::MessageType::kNotification); - ApplicationManagerImpl::instance()->ManageMobileCommand(message); + application_manager_.ManageMobileCommand(message, ORIGIN_SDL); } void NotificationFromHMI::CreateHMIRequest( const hmi_apis::FunctionID::eType& function_id, const smart_objects::SmartObject& msg_params) const { - smart_objects::SmartObjectSPtr result = new smart_objects::SmartObject; if (!result) { LOG4CXX_ERROR(logger_, "Memory allocation failed."); @@ -78,8 +74,8 @@ void NotificationFromHMI::CreateHMIRequest( } // get hmi correlation id for chaining further request from this object - const uint32_t hmi_correlation_id_ = ApplicationManagerImpl::instance() - ->GetNextHMICorrelationID(); + const uint32_t hmi_correlation_id_ = + application_manager_.GetNextHMICorrelationID(); NsSmartDeviceLink::NsSmartObjects::SmartObject& request = *result; request[strings::params][strings::message_type] = @@ -94,7 +90,7 @@ void NotificationFromHMI::CreateHMIRequest( request[strings::msg_params] = msg_params; - if (!ApplicationManagerImpl::instance()->ManageHMICommand(result)) { + if (!application_manager_.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 e4f8920ec9..f1e933b7ef 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 @@ -31,21 +31,20 @@ */ #include "application_manager/commands/hmi/notification_to_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { namespace commands { -NotificationToHMI::NotificationToHMI(const MessageSharedPtr& message) - : CommandImpl(message) { - +NotificationToHMI::NotificationToHMI(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : CommandImpl(message, application_manager) { // Replace Mobile connection id with HMI app id - ApplicationManagerImpl::instance()->ReplaceMobileByHMIAppId(*(message.get())); + ReplaceMobileByHMIAppId(*(message.get())); } -NotificationToHMI::~NotificationToHMI() { -} +NotificationToHMI::~NotificationToHMI() {} bool NotificationToHMI::Init() { return true; @@ -55,13 +54,12 @@ bool NotificationToHMI::CleanUp() { return true; } -void NotificationToHMI::Run() { -} +void NotificationToHMI::Run() {} void NotificationToHMI::SendNotification() { (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - ApplicationManagerImpl::instance()->SendMessageToHMI(message_); + application_manager_.SendMessageToHMI(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/on_allow_sdl_functionality_notification.cc b/src/components/application_manager/src/commands/hmi/on_allow_sdl_functionality_notification.cc index 506413ce1e..70e5e7cefd 100644 --- a/src/components/application_manager/src/commands/hmi/on_allow_sdl_functionality_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_allow_sdl_functionality_notification.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/on_allow_sdl_functionality_notification.h" +#include "application_manager/application_manager.h" #include "application_manager/policies/policy_handler.h" namespace application_manager { @@ -38,20 +39,18 @@ namespace application_manager { namespace commands { OnAllowSDLFunctionalityNotification::OnAllowSDLFunctionalityNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnAllowSDLFunctionalityNotification::~OnAllowSDLFunctionalityNotification() { -} +OnAllowSDLFunctionalityNotification::~OnAllowSDLFunctionalityNotification() {} void OnAllowSDLFunctionalityNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - uint32_t device_id = 0; + std::string device_id; if ((*message_)[strings::msg_params].keyExists("device")) { - device_id = (*message_)[strings::msg_params]["device"]["id"].asUInt(); + device_id = (*message_)[strings::msg_params]["device"]["id"].asString(); } - policy::PolicyHandler::instance()->OnAllowSDLFunctionalityNotification( + application_manager_.GetPolicyHandler().OnAllowSDLFunctionalityNotification( (*message_)[strings::msg_params][hmi_response::allowed].asBool(), device_id); } @@ -59,4 +58,3 @@ void OnAllowSDLFunctionalityNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc index 0ff76a45f5..76252a50fd 100644 --- a/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc @@ -31,7 +31,7 @@ */ #include "application_manager/commands/hmi/on_app_activated_notification.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/message_helper.h" #include "interfaces/HMI_API.h" @@ -40,22 +40,19 @@ namespace application_manager { namespace commands { OnAppActivatedNotification::OnAppActivatedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnAppActivatedNotification::~OnAppActivatedNotification() { -} +OnAppActivatedNotification::~OnAppActivatedNotification() {} void OnAppActivatedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - uint32_t app_id = ((*message_)[strings::msg_params][strings::app_id]).asUInt(); - ApplicationManagerImpl::instance()->SetState<true>(app_id, - mobile_apis::HMILevel::HMI_FULL - ); + event_engine::Event event( + hmi_apis::FunctionID::BasicCommunication_OnAppActivated); + event.set_smart_object(*message_); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc index 3df1c566d9..86ce6a830c 100644 --- a/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc @@ -31,10 +31,10 @@ */ #include "application_manager/commands/hmi/on_app_deactivated_notification.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" -#include "config_profile/profile.h" + #include "utils/helpers.h" namespace application_manager { @@ -42,77 +42,19 @@ namespace application_manager { namespace commands { OnAppDeactivatedNotification::OnAppDeactivatedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnAppDeactivatedNotification::~OnAppDeactivatedNotification() { -} +OnAppDeactivatedNotification::~OnAppDeactivatedNotification() {} void OnAppDeactivatedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - - uint32_t app_id = (*message_)[strings::msg_params][strings::app_id].asUInt(); - ApplicationSharedPtr app = - ApplicationManagerImpl::instance()->application(app_id); - - if (!app.valid()) { - LOG4CXX_ERROR(logger_, "Application with id " << app_id << " not found"); - return; - } - - using namespace hmi_apis; - using namespace mobile_apis; - using namespace helpers; - - Common_DeactivateReason::eType deactivate_reason = - static_cast<Common_DeactivateReason::eType> - ((*message_)[strings::msg_params][hmi_request::reason].asInt()); - - if (!((Common_DeactivateReason::AUDIO == deactivate_reason || - Common_DeactivateReason::PHONECALL == deactivate_reason) && - HMILevel::HMI_LIMITED == app->hmi_level())) { - app = ApplicationManagerImpl::instance()->active_application(); - - if (!app.valid()) { - LOG4CXX_ERROR_EXT(logger_, "No active application"); - return; - } - if (app_id != app->app_id()) { - LOG4CXX_ERROR_EXT(logger_, "Wrong application id"); - return; - } - } - - if (HMILevel::HMI_NONE == app->hmi_level()) { - return; - } - HmiStatePtr regular = app->RegularHmiState(); - DCHECK_OR_RETURN_VOID(regular); - HmiStatePtr new_regular(new HmiState(*regular)); - - switch ((*message_)[strings::msg_params][hmi_request::reason].asInt()) { - case hmi_apis::Common_DeactivateReason::AUDIO: { - new_regular->set_audio_streaming_state(mobile_api::AudioStreamingState::NOT_AUDIBLE); - new_regular->set_hmi_level(mobile_api::HMILevel::HMI_BACKGROUND); - break; - } - case hmi_apis::Common_DeactivateReason::NAVIGATIONMAP: - case hmi_apis::Common_DeactivateReason::PHONEMENU: - case hmi_apis::Common_DeactivateReason::SYNCSETTINGS: - case hmi_apis::Common_DeactivateReason::GENERAL: { - if (app->IsAudioApplication()) { - new_regular->set_hmi_level(mobile_api::HMILevel::HMI_LIMITED); - } else { - new_regular->set_hmi_level(mobile_api::HMILevel::HMI_BACKGROUND); - } - } - } - ApplicationManagerImpl::instance()->SetState<false>(app->app_id(), new_regular); - + event_engine::Event event( + hmi_apis::FunctionID::BasicCommunication_OnAppDeactivated); + event.set_smart_object(*message_); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_app_permission_changed_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_permission_changed_notification.cc index c786b486f4..fa7293513a 100644 --- a/src/components/application_manager/src/commands/hmi/on_app_permission_changed_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_app_permission_changed_notification.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { OnAppPermissionChangedNotification::OnAppPermissionChangedNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) {} -OnAppPermissionChangedNotification::~OnAppPermissionChangedNotification() { -} +OnAppPermissionChangedNotification::~OnAppPermissionChangedNotification() {} void OnAppPermissionChangedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); diff --git a/src/components/application_manager/src/commands/hmi/on_app_permission_consent_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_permission_consent_notification.cc index 69a18200fa..0efc1aee8a 100644 --- a/src/components/application_manager/src/commands/hmi/on_app_permission_consent_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_app_permission_consent_notification.cc @@ -32,20 +32,19 @@ */ #include "application_manager/commands/hmi/on_app_permission_consent_notification.h" -#include "application_manager/application_manager_impl.h" -#include "application_manager/message_helper.h" +#include "application_manager/application_manager.h" #include "application_manager/policies/policy_handler.h" +#include "application_manager/message_helper.h" namespace application_manager { namespace commands { -OnAppPermissionConsentNotification::OnAppPermissionConsentNotification(const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} +OnAppPermissionConsentNotification::OnAppPermissionConsentNotification( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnAppPermissionConsentNotification::~OnAppPermissionConsentNotification() { -} +OnAppPermissionConsentNotification::~OnAppPermissionConsentNotification() {} void OnAppPermissionConsentNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -62,28 +61,29 @@ void OnAppPermissionConsentNotification::Run() { if (msg_params.keyExists("consentedFunctions")) { smart_objects::SmartArray* user_consent = - msg_params["consentedFunctions"].asArray(); - - smart_objects::SmartArray::const_iterator it = user_consent->begin(); - smart_objects::SmartArray::const_iterator it_end = user_consent->end(); - for (; it != it_end; ++it) { - policy::FunctionalGroupPermission permissions; - permissions.group_id = (*it)["id"].asInt(); - permissions.group_alias = (*it)["name"].asString(); - if ((*it).keyExists("allowed")) { - permissions.state = (*it)["allowed"].asBool() ? policy::kGroupAllowed : - policy::kGroupDisallowed; - } else { - permissions.state = policy::kGroupUndefined; - } + msg_params["consentedFunctions"].asArray(); + + smart_objects::SmartArray::const_iterator it = user_consent->begin(); + smart_objects::SmartArray::const_iterator it_end = user_consent->end(); + for (; it != it_end; ++it) { + policy::FunctionalGroupPermission permissions; + permissions.group_id = (*it)["id"].asInt(); + permissions.group_alias = (*it)["name"].asString(); + if ((*it).keyExists("allowed")) { + permissions.state = (*it)["allowed"].asBool() + ? policy::kGroupAllowed + : policy::kGroupDisallowed; + } else { + permissions.state = policy::kGroupUndefined; + } permission_consent.group_permissions.push_back(permissions); } permission_consent.consent_source = msg_params["source"].asString(); - policy::PolicyHandler::instance()->OnAppPermissionConsent(connection_key, - permission_consent); + application_manager_.GetPolicyHandler().OnAppPermissionConsent( + connection_key, permission_consent); } } diff --git a/src/components/application_manager/src/commands/hmi/on_app_registered_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_registered_notification.cc index af3f45fed0..a97e19b556 100644 --- a/src/components/application_manager/src/commands/hmi/on_app_registered_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_app_registered_notification.cc @@ -31,30 +31,28 @@ */ #include "application_manager/commands/hmi/on_app_registered_notification.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { OnAppRegisteredNotification::OnAppRegisteredNotification( - const MessageSharedPtr& message) : NotificationToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) {} -OnAppRegisteredNotification::~OnAppRegisteredNotification() { -} +OnAppRegisteredNotification::~OnAppRegisteredNotification() {} void OnAppRegisteredNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); // SDL must notify system about app registration before any dependent actions // will be started SendNotification(); - event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_OnAppRegistered); + event_engine::Event event( + hmi_apis::FunctionID::BasicCommunication_OnAppRegistered); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_app_unregistered_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_unregistered_notification.cc index 571c6f381c..10ea1ea303 100644 --- a/src/components/application_manager/src/commands/hmi/on_app_unregistered_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_app_unregistered_notification.cc @@ -31,7 +31,7 @@ */ #include "application_manager/commands/hmi/on_app_unregistered_notification.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/event_engine/event.h" namespace application_manager { @@ -39,19 +39,19 @@ namespace application_manager { namespace commands { OnAppUnregisteredNotification::OnAppUnregisteredNotification( - const MessageSharedPtr& message) : NotificationToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) {} -OnAppUnregisteredNotification::~OnAppUnregisteredNotification() { -} +OnAppUnregisteredNotification::~OnAppUnregisteredNotification() {} void OnAppUnregisteredNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - //sending event for delete VRCommand on PerformInteraction - event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_OnAppUnregistered); + // sending event for delete VRCommand on PerformInteraction + event_engine::Event event( + hmi_apis::FunctionID::BasicCommunication_OnAppUnregistered); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); SendNotification(); } @@ -59,4 +59,3 @@ void OnAppUnregisteredNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_audio_data_streaming_notification.cc b/src/components/application_manager/src/commands/hmi/on_audio_data_streaming_notification.cc index d94d298509..c3e81bdc30 100644 --- a/src/components/application_manager/src/commands/hmi/on_audio_data_streaming_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_audio_data_streaming_notification.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { OnAudioDataStreamingNotification::OnAudioDataStreamingNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) {} -OnAudioDataStreamingNotification::~OnAudioDataStreamingNotification() { -} +OnAudioDataStreamingNotification::~OnAudioDataStreamingNotification() {} void OnAudioDataStreamingNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +50,3 @@ void OnAudioDataStreamingNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_button_event_notification.cc b/src/components/application_manager/src/commands/hmi/on_button_event_notification.cc index 2beffc2bdd..fc8d5989a1 100644 --- a/src/components/application_manager/src/commands/hmi/on_button_event_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_button_event_notification.cc @@ -31,7 +31,7 @@ */ #include "application_manager/commands/hmi/on_button_event_notification.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/application_impl.h" #include "utils/logger.h" @@ -42,8 +42,8 @@ namespace commands { namespace hmi { OnButtonEventNotification::OnButtonEventNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} void OnButtonEventNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -59,4 +59,3 @@ void OnButtonEventNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_button_press_notification.cc b/src/components/application_manager/src/commands/hmi/on_button_press_notification.cc index 261aa68ee7..abff87c962 100644 --- a/src/components/application_manager/src/commands/hmi/on_button_press_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_button_press_notification.cc @@ -31,7 +31,7 @@ */ #include "application_manager/commands/hmi/on_button_press_notification.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/application_impl.h" #include "utils/logger.h" #include "application_manager/event_engine/event.h" @@ -43,14 +43,14 @@ namespace commands { namespace hmi { OnButtonPressNotification::OnButtonPressNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} void OnButtonPressNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::Buttons_OnButtonPress); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); (*message_)[strings::params][strings::function_id] = static_cast<int>(mobile_apis::FunctionID::eType::OnButtonPressID); SendNotificationToMobile(message_); @@ -61,4 +61,3 @@ void OnButtonPressNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_button_subscription_notification.cc b/src/components/application_manager/src/commands/hmi/on_button_subscription_notification.cc index 3c31de054e..aae994ea34 100644 --- a/src/components/application_manager/src/commands/hmi/on_button_subscription_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_button_subscription_notification.cc @@ -39,11 +39,10 @@ namespace commands { namespace hmi { OnButtonSubscriptionNotification::OnButtonSubscriptionNotification( - const MessageSharedPtr& message) : NotificationToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) {} -OnButtonSubscriptionNotification::~OnButtonSubscriptionNotification() { -} +OnButtonSubscriptionNotification::~OnButtonSubscriptionNotification() {} void OnButtonSubscriptionNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -56,4 +55,3 @@ void OnButtonSubscriptionNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_device_chosen_notification.cc b/src/components/application_manager/src/commands/hmi/on_device_chosen_notification.cc index 441538bee2..83ec785a9d 100644 --- a/src/components/application_manager/src/commands/hmi/on_device_chosen_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_device_chosen_notification.cc @@ -31,24 +31,22 @@ */ #include "application_manager/commands/hmi/on_device_chosen_notification.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { OnDeviceChosenNotification::OnDeviceChosenNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnDeviceChosenNotification::~OnDeviceChosenNotification() { -} +OnDeviceChosenNotification::~OnDeviceChosenNotification() {} void OnDeviceChosenNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); if ((*message_)[strings::msg_params].keyExists(strings::device_info)) { - ApplicationManagerImpl::instance()->ConnectToDevice( + application_manager_.ConnectToDevice( (*message_)[strings::msg_params][strings::device_info][strings::id] .asString()); } @@ -57,4 +55,3 @@ void OnDeviceChosenNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_device_state_changed_notification.cc b/src/components/application_manager/src/commands/hmi/on_device_state_changed_notification.cc index b41eb6b861..346c05032b 100644 --- a/src/components/application_manager/src/commands/hmi/on_device_state_changed_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_device_state_changed_notification.cc @@ -32,44 +32,46 @@ #include <algorithm> #include "application_manager/commands/hmi/on_device_state_changed_notification.h" -#include "application_manager/policies/policy_handler.h" +#include "application_manager/application_manager.h" #include "application_manager/message_helper.h" #include "interfaces/HMI_API.h" #include "encryption/hashing.h" namespace { - // TODO(AOleynik) : replace this !!! - void check_zero(const char& a, const char& b, std::string& bt_mac) { - if ('0' != a && '0' == b) { - bt_mac.push_back(a); - bt_mac.push_back(b); - } else if ('0' == a) { - bt_mac.push_back(b); - } else { - bt_mac.push_back(a); - bt_mac.push_back(b); - } - } - - std::string convert_to_bt_mac(std::string& deviceInternalId) { - std::transform(deviceInternalId.begin(), deviceInternalId.end(),deviceInternalId.begin(), ::tolower); +// TODO(AOleynik) : replace this !!! +void check_zero(const char& a, const char& b, std::string& bt_mac) { + if ('0' != a && '0' == b) { + bt_mac.push_back(a); + bt_mac.push_back(b); + } else if ('0' == a) { + bt_mac.push_back(b); + } else { + bt_mac.push_back(a); + bt_mac.push_back(b); + } +} - std::string bt_mac; - check_zero(deviceInternalId[10], deviceInternalId[11], bt_mac); - bt_mac.push_back(':'); - check_zero(deviceInternalId[8], deviceInternalId[9], bt_mac); - bt_mac.push_back(':'); - check_zero(deviceInternalId[6], deviceInternalId[7], bt_mac); - bt_mac.push_back(':'); - check_zero(deviceInternalId[4], deviceInternalId[5], bt_mac); - bt_mac.push_back(':'); - check_zero(deviceInternalId[2], deviceInternalId[3], bt_mac); - bt_mac.push_back(':'); - check_zero(deviceInternalId[0], deviceInternalId[1], bt_mac); +std::string convert_to_bt_mac(std::string& deviceInternalId) { + std::transform(deviceInternalId.begin(), + deviceInternalId.end(), + deviceInternalId.begin(), + ::tolower); - return bt_mac; - } + std::string bt_mac; + check_zero(deviceInternalId[10], deviceInternalId[11], bt_mac); + bt_mac.push_back(':'); + check_zero(deviceInternalId[8], deviceInternalId[9], bt_mac); + bt_mac.push_back(':'); + check_zero(deviceInternalId[6], deviceInternalId[7], bt_mac); + bt_mac.push_back(':'); + check_zero(deviceInternalId[4], deviceInternalId[5], bt_mac); + bt_mac.push_back(':'); + check_zero(deviceInternalId[2], deviceInternalId[3], bt_mac); + bt_mac.push_back(':'); + check_zero(deviceInternalId[0], deviceInternalId[1], bt_mac); + return bt_mac; +} } namespace application_manager { @@ -77,35 +79,34 @@ namespace application_manager { namespace commands { OnDeviceStateChangedNotification::OnDeviceStateChangedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnDeviceStateChangedNotification::~OnDeviceStateChangedNotification() { -} +OnDeviceStateChangedNotification::~OnDeviceStateChangedNotification() {} void OnDeviceStateChangedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - if ((*message_)[strings::msg_params]["deviceState"] - == hmi_apis::Common_DeviceState::UNPAIRED) { - // It is expected, that "deviceInternalId" is the device MAC address in - // form XXXXXXXXXX - std::string device_id = (*message_)[strings::msg_params]["deviceInternalId"] - .asString(); + if ((*message_)[strings::msg_params]["deviceState"] == + hmi_apis::Common_DeviceState::UNPAIRED) { + // It is expected, that "deviceInternalId" is the device MAC address in + // form XXXXXXXXXX + std::string device_id = + (*message_)[strings::msg_params]["deviceInternalId"].asString(); if (device_id.empty()) { if ((*message_)[strings::msg_params].keyExists("deviceId")) { - device_id = (*message_)[strings::msg_params]["deviceId"]["id"].asString(); + device_id = + (*message_)[strings::msg_params]["deviceId"]["id"].asString(); } } else { - // Policy uses hashed MAC address as device_id - LOG4CXX_DEBUG(logger_,"Device_id from HMI: " << device_id); - std::string bt_mac = convert_to_bt_mac(device_id); - LOG4CXX_DEBUG(logger_,"Device_id as BT MAC: " << bt_mac); - device_id = encryption::MakeHash(bt_mac); - LOG4CXX_DEBUG(logger_,"Device_id hashed as BT MAC : " << device_id); + // Policy uses hashed MAC address as device_id + LOG4CXX_DEBUG(logger_, "Device_id from HMI: " << device_id); + std::string bt_mac = convert_to_bt_mac(device_id); + LOG4CXX_DEBUG(logger_, "Device_id as BT MAC: " << bt_mac); + device_id = encryption::MakeHash(bt_mac); + LOG4CXX_DEBUG(logger_, "Device_id hashed as BT MAC : " << device_id); } - policy::PolicyHandler::instance()->RemoveDevice(device_id); + application_manager_.GetPolicyHandler().RemoveDevice(device_id); } } diff --git a/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc b/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc index ceb6e1b586..4c322c456f 100644 --- a/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_driver_distraction_notification.cc @@ -32,7 +32,7 @@ #include <set> #include "application_manager/commands/hmi/on_driver_distraction_notification.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/application_impl.h" #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" @@ -44,27 +44,24 @@ namespace commands { namespace hmi { OnDriverDistractionNotification::OnDriverDistractionNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnDriverDistractionNotification::~OnDriverDistractionNotification() { -} +OnDriverDistractionNotification::~OnDriverDistractionNotification() {} void OnDriverDistractionNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); const hmi_apis::Common_DriverDistractionState::eType state = static_cast<hmi_apis::Common_DriverDistractionState::eType>( - (*message_)[strings::msg_params][hmi_notification::state] - .asInt()); - ApplicationManagerImpl::instance()->set_driver_distraction(state); + (*message_)[strings::msg_params][hmi_notification::state].asInt()); + application_manager_.set_driver_distraction(state); smart_objects::SmartObjectSPtr on_driver_distraction = new smart_objects::SmartObject(); if (!on_driver_distraction) { - LOG4CXX_ERROR_EXT(logger_, "NULL pointer"); + LOG4CXX_ERROR(logger_, "NULL pointer"); return; } @@ -74,15 +71,15 @@ void OnDriverDistractionNotification::Run() { (*on_driver_distraction)[strings::msg_params][mobile_notification::state] = state; - ApplicationManagerImpl::ApplicationListAccessor accessor; - const ApplicationManagerImpl::ApplictionSet applications = accessor.applications(); + const ApplicationSet applications = + application_manager_.applications().GetData(); - ApplicationManagerImpl::ApplictionSetConstIt it = applications.begin(); + ApplicationSetConstIt it = applications.begin(); for (; applications.end() != it; ++it) { const ApplicationSharedPtr app = *it; if (app) { - (*on_driver_distraction)[strings::params] - [strings::connection_key] = app->app_id(); + (*on_driver_distraction)[strings::params][strings::connection_key] = + app->app_id(); SendNotificationToMobile(on_driver_distraction); } } @@ -93,4 +90,3 @@ void OnDriverDistractionNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_emergency_event_notification.cc b/src/components/application_manager/src/commands/hmi/on_event_changed_notification.cc index 47b80a1d2b..c211ffde50 100644 --- a/src/components/application_manager/src/commands/hmi/on_emergency_event_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_event_changed_notification.cc @@ -30,30 +30,26 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "application_manager/commands/hmi/on_emergency_event_notification.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/commands/hmi/on_event_changed_notification.h" namespace application_manager { namespace commands { -OnEmergencyEventNotification::OnEmergencyEventNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} +OnEventChangedNotification::OnEventChangedNotification( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnEmergencyEventNotification::~OnEmergencyEventNotification() { -} +OnEventChangedNotification::~OnEventChangedNotification() {} -void OnEmergencyEventNotification::Run() { +void OnEventChangedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_OnEmergencyEvent); + event_engine::Event event( + hmi_apis::FunctionID::BasicCommunication_OnEventChanged); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands } // namespace application_manager - - 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 7c09800d21..682093cef9 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 @@ -36,20 +36,19 @@ #include <unistd.h> #include <signal.h> -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" +#include "application_manager/resumption/resume_ctrl.h" #include "interfaces/HMI_API.h" - namespace application_manager { namespace commands { OnExitAllApplicationsNotification::OnExitAllApplicationsNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnExitAllApplicationsNotification::~OnExitAllApplicationsNotification() { -} +OnExitAllApplicationsNotification::~OnExitAllApplicationsNotification() {} void OnExitAllApplicationsNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -62,8 +61,6 @@ void OnExitAllApplicationsNotification::Run() { mobile_api::AppInterfaceUnregisteredReason::eType mob_reason = mobile_api::AppInterfaceUnregisteredReason::INVALID_ENUM; - ApplicationManagerImpl* app_manager = ApplicationManagerImpl::instance(); - switch (reason) { case hmi_apis::Common_ApplicationsCloseReason::IGNITION_OFF: { mob_reason = mobile_api::AppInterfaceUnregisteredReason::IGNITION_OFF; @@ -81,17 +78,18 @@ void OnExitAllApplicationsNotification::Run() { SendOnSDLPersistenceComplete(); return; } - default : { + default: { LOG4CXX_ERROR(logger_, "Unknown Application close reason" << reason); return; } } - app_manager->SetUnregisterAllApplicationsReason(mob_reason); + application_manager_.SetUnregisterAllApplicationsReason(mob_reason); if (mobile_api::AppInterfaceUnregisteredReason::MASTER_RESET == mob_reason || - mobile_api::AppInterfaceUnregisteredReason::FACTORY_DEFAULTS == mob_reason) { - app_manager->HeadUnitReset(mob_reason); + mobile_api::AppInterfaceUnregisteredReason::FACTORY_DEFAULTS == + mob_reason) { + application_manager_.HeadUnitReset(mob_reason); } kill(getpid(), SIGINT); } @@ -103,14 +101,14 @@ void OnExitAllApplicationsNotification::SendOnSDLPersistenceComplete() { new smart_objects::SmartObject(smart_objects::SmartType_Map); (*message)[strings::params][strings::function_id] = hmi_apis::FunctionID::BasicCommunication_OnSDLPersistenceComplete; - (*message)[strings::params][strings::message_type] = MessageType::kNotification; + (*message)[strings::params][strings::message_type] = + MessageType::kNotification; (*message)[strings::params][strings::correlation_id] = - ApplicationManagerImpl::instance()->GetNextHMICorrelationID(); + application_manager_.GetNextHMICorrelationID(); - ApplicationManagerImpl::instance()->ManageHMICommand(message); + application_manager_.ManageHMICommand(message); } } // namespace commands } // namespace application_manager - 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 d64ba3adf9..a7b6b9a2cd 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 @@ -31,8 +31,9 @@ */ #include "application_manager/commands/hmi/on_exit_application_notification.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/application_impl.h" +#include "application_manager/state_controller.h" #include "application_manager/message_helper.h" #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" @@ -42,39 +43,70 @@ namespace application_manager { namespace commands { OnExitApplicationNotification::OnExitApplicationNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnExitApplicationNotification::~OnExitApplicationNotification() { -} +OnExitApplicationNotification::~OnExitApplicationNotification() {} void OnExitApplicationNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - ApplicationManagerImpl* app_mgr = ApplicationManagerImpl::instance(); - ApplicationSharedPtr app_impl = app_mgr->application( - (*message_)[strings::msg_params][strings::app_id].asUInt()); + using namespace mobile_apis; + using namespace hmi_apis; + + uint32_t app_id = (*message_)[strings::msg_params][strings::app_id].asUInt(); + ApplicationSharedPtr app_impl = application_manager_.application(app_id); + if (!(app_impl.valid())) { LOG4CXX_ERROR(logger_, "Application does not exist"); return; } - hmi_apis::Common_ApplicationToNONEReason::eType reason; - reason = static_cast<hmi_apis::Common_ApplicationToNONEReason::eType> - ((*message_)[strings::msg_params][strings::reason].asInt()); + + Common_ApplicationExitReason::eType reason; + reason = static_cast<Common_ApplicationExitReason::eType>( + (*message_)[strings::msg_params][strings::reason].asInt()); + switch (reason) { - case hmi_apis::Common_ApplicationToNONEReason::USER_EXIT : { + case Common_ApplicationExitReason::DRIVER_DISTRACTION_VIOLATION: { + application_manager_.ManageMobileCommand( + MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( + app_id, + AppInterfaceUnregisteredReason::DRIVER_DISTRACTION_VIOLATION), + commands::Command::ORIGIN_SDL); break; } - default : { - LOG4CXX_WARN(logger_, "Unhandled reason"); + case Common_ApplicationExitReason::USER_EXIT: { break; } + case Common_ApplicationExitReason::UNAUTHORIZED_TRANSPORT_REGISTRATION: { + application_manager_.ManageMobileCommand( + MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( + app_id, AppInterfaceUnregisteredReason::APP_UNAUTHORIZED), + commands::Command::ORIGIN_SDL); + // HMI rejects registration for navi application + application_manager_.UnregisterApplication(app_id, Result::SUCCESS); + return; + } + case Common_ApplicationExitReason::UNSUPPORTED_HMI_RESOURCE: { + application_manager_.ManageMobileCommand( + MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( + app_id, AppInterfaceUnregisteredReason::UNSUPPORTED_HMI_RESOURCE), + commands::Command::ORIGIN_SDL); + application_manager_.UnregisterApplication(app_id, Result::SUCCESS); + return; + } + default: { + LOG4CXX_WARN(logger_, "Unhandled reason"); + return; + } + } + ApplicationSharedPtr app = application_manager_.application(app_id); + if (app) { + application_manager_.state_controller().SetRegularState( + app, HMILevel::HMI_NONE, AudioStreamingState::NOT_AUDIBLE, false); + } else { + LOG4CXX_ERROR(logger_, "Unable to find appication " << app_id); } - using namespace mobile_apis; - ApplicationManagerImpl::instance()->SetState<false>(app_impl->app_id(), - HMILevel::HMI_NONE, - AudioStreamingState::NOT_AUDIBLE, - SystemContext::SYSCTXT_MAIN); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/on_file_removed_notification.cc b/src/components/application_manager/src/commands/hmi/on_file_removed_notification.cc index 83c3e61a0c..e69d111d2c 100644 --- a/src/components/application_manager/src/commands/hmi/on_file_removed_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_file_removed_notification.cc @@ -31,18 +31,16 @@ */ #include "application_manager/commands/hmi/on_file_removed_notification.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { OnFileRemovedNotification::OnFileRemovedNotification( - const MessageSharedPtr& message) : NotificationToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) {} -OnFileRemovedNotification::~OnFileRemovedNotification() { -} +OnFileRemovedNotification::~OnFileRemovedNotification() {} void OnFileRemovedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void OnFileRemovedNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_find_applications.cc b/src/components/application_manager/src/commands/hmi/on_find_applications.cc index fc1b72c73a..9d3633ba6d 100644 --- a/src/components/application_manager/src/commands/hmi/on_find_applications.cc +++ b/src/components/application_manager/src/commands/hmi/on_find_applications.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -OnFindApplications::OnFindApplications(const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} +OnFindApplications::OnFindApplications(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnFindApplications::~OnFindApplications() { -} +OnFindApplications::~OnFindApplications() {} void OnFindApplications::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void OnFindApplications::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_ignition_cycle_over_notification.cc b/src/components/application_manager/src/commands/hmi/on_ignition_cycle_over_notification.cc index 32babf05cc..8c772d6dcd 100644 --- a/src/components/application_manager/src/commands/hmi/on_ignition_cycle_over_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_ignition_cycle_over_notification.cc @@ -31,26 +31,23 @@ */ #include "application_manager/commands/hmi/on_ignition_cycle_over_notification.h" -#include "application_manager/policies/policy_handler.h" +#include "application_manager/application_manager.h" namespace application_manager { namespace commands { OnIgnitionCycleOverNotification::OnIgnitionCycleOverNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnIgnitionCycleOverNotification::~OnIgnitionCycleOverNotification() { -} +OnIgnitionCycleOverNotification::~OnIgnitionCycleOverNotification() {} void OnIgnitionCycleOverNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - policy::PolicyHandler::instance()->OnIgnitionCycleOver(); + application_manager_.GetPolicyHandler().OnIgnitionCycleOver(); } } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_navi_tbt_client_state_notification.cc b/src/components/application_manager/src/commands/hmi/on_navi_tbt_client_state_notification.cc index 87db5d4a38..e25de1f3a9 100644 --- a/src/components/application_manager/src/commands/hmi/on_navi_tbt_client_state_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_navi_tbt_client_state_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnNaviTBTClientStateNotification::OnNaviTBTClientStateNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnNaviTBTClientStateNotification::~OnNaviTBTClientStateNotification() { -} +OnNaviTBTClientStateNotification::~OnNaviTBTClientStateNotification() {} void OnNaviTBTClientStateNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnNaviTBTClientStateNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_navi_way_point_change_notification.cc b/src/components/application_manager/src/commands/hmi/on_navi_way_point_change_notification.cc new file mode 100644 index 0000000000..17d1b420be --- /dev/null +++ b/src/components/application_manager/src/commands/hmi/on_navi_way_point_change_notification.cc @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2015, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include "application_manager/commands/hmi/on_navi_way_point_change_notification.h" + +namespace application_manager { + +namespace commands { + +OnNaviWayPointChangeNotification::OnNaviWayPointChangeNotification( + const MessageSharedPtr& message, ApplicationManager& app_man) + : NotificationFromHMI(message, app_man) {} + +OnNaviWayPointChangeNotification::~OnNaviWayPointChangeNotification() {} + +void OnNaviWayPointChangeNotification::Run() { + LOG4CXX_AUTO_TRACE(logger_); + + // prepare SmartObject for mobile factory + (*message_)[strings::params][strings::function_id] = + static_cast<int32_t>(mobile_apis::FunctionID::OnWayPointChangeID); + + SendNotificationToMobile(message_); +} + +} // namespace commands + +} // namespace application_manager diff --git a/src/components/application_manager/src/commands/hmi/on_policy_update.cc b/src/components/application_manager/src/commands/hmi/on_policy_update.cc index 56c544888a..39b179f967 100644 --- a/src/components/application_manager/src/commands/hmi/on_policy_update.cc +++ b/src/components/application_manager/src/commands/hmi/on_policy_update.cc @@ -31,21 +31,20 @@ */ #include "application_manager/commands/hmi/on_policy_update.h" -#include "application_manager/policies/policy_handler.h" +#include "application_manager/application_manager.h" namespace application_manager { namespace commands { -OnPolicyUpdate::OnPolicyUpdate(const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} +OnPolicyUpdate::OnPolicyUpdate(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnPolicyUpdate::~OnPolicyUpdate() { -} +OnPolicyUpdate::~OnPolicyUpdate() {} void OnPolicyUpdate::Run() { LOG4CXX_AUTO_TRACE(logger_); - policy::PolicyHandler::instance()->OnPTExchangeNeeded(); + application_manager_.GetPolicyHandler().OnPTExchangeNeeded(); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/on_put_file_notification.cc b/src/components/application_manager/src/commands/hmi/on_put_file_notification.cc index cf0297df01..596b7d4549 100644 --- a/src/components/application_manager/src/commands/hmi/on_put_file_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_put_file_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnPutFileNotification::OnPutFileNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) {} -OnPutFileNotification::~OnPutFileNotification() { -} +OnPutFileNotification::~OnPutFileNotification() {} void OnPutFileNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void OnPutFileNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_ready_notification.cc b/src/components/application_manager/src/commands/hmi/on_ready_notification.cc index f1ac8b6d3c..3a45e0f934 100644 --- a/src/components/application_manager/src/commands/hmi/on_ready_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_ready_notification.cc @@ -31,29 +31,26 @@ */ #include "application_manager/commands/hmi/on_ready_notification.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { -OnReadyNotification::OnReadyNotification(const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} +OnReadyNotification::OnReadyNotification( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnReadyNotification::~OnReadyNotification() { -} +OnReadyNotification::~OnReadyNotification() {} void OnReadyNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - ApplicationManagerImpl::instance()->OnHMIStartedCooperation(); + application_manager_.OnHMIStartedCooperation(); event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_OnReady); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc b/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc index f739c762c7..03c0bc7378 100644 --- a/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc +++ b/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc @@ -32,32 +32,31 @@ #include <string> #include "application_manager/commands/hmi/on_received_policy_update.h" -#include "application_manager/policies/policy_handler.h" +#include "application_manager/application_manager.h" #include "utils/file_system.h" namespace application_manager { namespace commands { -OnReceivedPolicyUpdate::OnReceivedPolicyUpdate(const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} +OnReceivedPolicyUpdate::OnReceivedPolicyUpdate( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnReceivedPolicyUpdate::~OnReceivedPolicyUpdate() { -} +OnReceivedPolicyUpdate::~OnReceivedPolicyUpdate() {} void OnReceivedPolicyUpdate::Run() { LOG4CXX_AUTO_TRACE(logger_); #ifdef EXTENDED_POLICY const std::string& file_path = - (*message_)[strings::msg_params][hmi_notification::policyfile].asString(); + (*message_)[strings::msg_params][hmi_notification::policyfile].asString(); policy::BinaryMessage file_content; if (!file_system::ReadBinaryFile(file_path, file_content)) { LOG4CXX_ERROR(logger_, "Failed to read Update file."); return; } - policy::PolicyHandler::instance()->ReceiveMessageFromSDK(file_path, - file_content); + application_manager_.GetPolicyHandler().ReceiveMessageFromSDK(file_path, + file_content); #else LOG4CXX_WARN(logger_, "This RPC is part of extended policy flow." diff --git a/src/components/application_manager/src/commands/hmi/on_record_start_notification.cc b/src/components/application_manager/src/commands/hmi/on_record_start_notification.cc index 163b525628..4d126ac67d 100644 --- a/src/components/application_manager/src/commands/hmi/on_record_start_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_record_start_notification.cc @@ -31,18 +31,16 @@ */ #include "application_manager/commands/hmi/on_record_start_notification.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { OnRecordStartdNotification::OnRecordStartdNotification( - const MessageSharedPtr& message) : NotificationToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) {} -OnRecordStartdNotification::~OnRecordStartdNotification() { -} +OnRecordStartdNotification::~OnRecordStartdNotification() {} void OnRecordStartdNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void OnRecordStartdNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_resume_audio_source_notification.cc b/src/components/application_manager/src/commands/hmi/on_resume_audio_source_notification.cc index 8e00c3447c..ce3c371cf8 100644 --- a/src/components/application_manager/src/commands/hmi/on_resume_audio_source_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_resume_audio_source_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnResumeAudioSourceNotification::OnResumeAudioSourceNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) {} -OnResumeAudioSourceNotification::~OnResumeAudioSourceNotification() { -} +OnResumeAudioSourceNotification::~OnResumeAudioSourceNotification() {} void OnResumeAudioSourceNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void OnResumeAudioSourceNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc b/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc index c393219134..0517ea8d24 100644 --- a/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_sdl_close_notification.cc @@ -37,14 +37,13 @@ namespace application_manager { namespace commands { OnSDLCloseNotification::OnSDLCloseNotification( - const MessageSharedPtr& message) : NotificationToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) {} -OnSDLCloseNotification::~OnSDLCloseNotification() { -} +OnSDLCloseNotification::~OnSDLCloseNotification() {} void OnSDLCloseNotification::Run() { - LOG4CXX_INFO(logger_, "OnSdlCloseNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } @@ -52,4 +51,3 @@ void OnSDLCloseNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_sdl_consent_needed_notification.cc b/src/components/application_manager/src/commands/hmi/on_sdl_consent_needed_notification.cc index 20010111fd..a9c36813f6 100644 --- a/src/components/application_manager/src/commands/hmi/on_sdl_consent_needed_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_sdl_consent_needed_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnSDLConsentNeededNotification::OnSDLConsentNeededNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) {} -OnSDLConsentNeededNotification::~OnSDLConsentNeededNotification() { -} +OnSDLConsentNeededNotification::~OnSDLConsentNeededNotification() {} void OnSDLConsentNeededNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void OnSDLConsentNeededNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc b/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc index afe0ffeabc..e30a0fb902 100644 --- a/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_sdl_persistence_complete_notification.cc @@ -37,15 +37,13 @@ namespace application_manager { namespace commands { OnSDLPersistenceCompleteNotification::OnSDLPersistenceCompleteNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) {} -OnSDLPersistenceCompleteNotification::~OnSDLPersistenceCompleteNotification() { -} +OnSDLPersistenceCompleteNotification::~OnSDLPersistenceCompleteNotification() {} void OnSDLPersistenceCompleteNotification::Run() { - LOG4CXX_INFO(logger_, "OnSDLpersistenceCompleteNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } diff --git a/src/components/application_manager/src/commands/hmi/on_start_device_discovery.cc b/src/components/application_manager/src/commands/hmi/on_start_device_discovery.cc index 6f867adbcd..8e94b2b004 100644 --- a/src/components/application_manager/src/commands/hmi/on_start_device_discovery.cc +++ b/src/components/application_manager/src/commands/hmi/on_start_device_discovery.cc @@ -31,26 +31,23 @@ */ #include "application_manager/commands/hmi/on_start_device_discovery.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { -OnStartDeviceDiscovery::OnStartDeviceDiscovery(const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} +OnStartDeviceDiscovery::OnStartDeviceDiscovery( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnStartDeviceDiscovery::~OnStartDeviceDiscovery() { -} +OnStartDeviceDiscovery::~OnStartDeviceDiscovery() {} void OnStartDeviceDiscovery::Run() { LOG4CXX_AUTO_TRACE(logger_); - ApplicationManagerImpl::instance()->StartDevicesDiscovery(); + application_manager_.StartDevicesDiscovery(); } } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc b/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc index 7db0053e2d..78a6b68324 100644 --- a/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_status_update_notification.cc @@ -37,19 +37,16 @@ namespace application_manager { namespace commands { OnStatusUpdateNotification::OnStatusUpdateNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) {} -OnStatusUpdateNotification::~OnStatusUpdateNotification() { -} +OnStatusUpdateNotification::~OnStatusUpdateNotification() {} void OnStatusUpdateNotification::Run() { - LOG4CXX_INFO(logger_, "OnGetStatusUpdateNotification::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendNotification(); } } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_system_context_notification.cc b/src/components/application_manager/src/commands/hmi/on_system_context_notification.cc index aa334d8259..887aacf5b9 100644 --- a/src/components/application_manager/src/commands/hmi/on_system_context_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_system_context_notification.cc @@ -31,57 +31,49 @@ */ #include "application_manager/commands/hmi/on_system_context_notification.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/application_impl.h" +#include "application_manager/state_controller.h" #include "application_manager/message_helper.h" namespace application_manager { namespace commands { OnSystemContextNotification::OnSystemContextNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnSystemContextNotification::~OnSystemContextNotification() { -} +OnSystemContextNotification::~OnSystemContextNotification() {} void OnSystemContextNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); mobile_api::SystemContext::eType system_context = - static_cast<mobile_api::SystemContext::eType>( - (*message_)[strings::msg_params][hmi_notification::system_context].asInt()); + static_cast<mobile_api::SystemContext::eType>( + (*message_)[strings::msg_params][hmi_notification::system_context] + .asInt()); ApplicationSharedPtr app; - if ((mobile_api::SystemContext::SYSCTXT_VRSESSION == system_context) || (mobile_api::SystemContext::SYSCTXT_MENU == system_context) || (mobile_api::SystemContext::SYSCTXT_HMI_OBSCURED == system_context)) { - app = ApplicationManagerImpl::instance()->active_application(); + app = application_manager_.active_application(); } else if ((mobile_api::SystemContext::SYSCTXT_ALERT == system_context) || (mobile_api::SystemContext::SYSCTXT_MAIN == system_context)) { if ((*message_)[strings::msg_params].keyExists(strings::app_id)) { - app = ApplicationManagerImpl::instance()-> - application((*message_)[strings::msg_params][strings::app_id].asUInt()); + app = application_manager_.application( + (*message_)[strings::msg_params][strings::app_id].asUInt()); } } - if (app.valid() && (system_context != app->system_context()) && - (system_context != mobile_api::SystemContext::INVALID_ENUM)) { - SendSystemContextNotification(app, system_context); + if (app && mobile_api::SystemContext::INVALID_ENUM != system_context) { + application_manager_.state_controller().SetRegularState(app, + system_context); } else { - LOG4CXX_ERROR(logger_, "Ignored wrong SystemContext notification!"); + LOG4CXX_ERROR(logger_, "Application does not exist"); } } -void OnSystemContextNotification::SendSystemContextNotification(ApplicationSharedPtr app, - mobile_api::SystemContext::eType system_context) { - ApplicationManagerImpl::instance()->SetState(app->app_id(), - system_context); -} - } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_system_error_notification.cc b/src/components/application_manager/src/commands/hmi/on_system_error_notification.cc index 09a96cc797..4885420f1c 100644 --- a/src/components/application_manager/src/commands/hmi/on_system_error_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_system_error_notification.cc @@ -31,7 +31,7 @@ */ #include "application_manager/commands/hmi/on_system_error_notification.h" -#include "application_manager/policies/policy_handler.h" +#include "application_manager/application_manager.h" #include "interfaces/HMI_API.h" namespace application_manager { @@ -39,23 +39,20 @@ namespace application_manager { namespace commands { OnSystemErrorNotification::OnSystemErrorNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnSystemErrorNotification::~OnSystemErrorNotification() { -} +OnSystemErrorNotification::~OnSystemErrorNotification() {} void OnSystemErrorNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - int code = (*message_)[strings::msg_params][hmi_notification::error] - .asInt(); + const int code = + (*message_)[strings::msg_params][hmi_notification::error].asInt(); - policy::PolicyHandler::instance()->OnSystemError(code); + application_manager_.GetPolicyHandler().OnSystemError(code); } } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_system_info_changed_notification.cc b/src/components/application_manager/src/commands/hmi/on_system_info_changed_notification.cc index fb5a9abc43..00b3649284 100644 --- a/src/components/application_manager/src/commands/hmi/on_system_info_changed_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_system_info_changed_notification.cc @@ -31,7 +31,7 @@ */ #include "application_manager/commands/hmi/on_system_info_changed_notification.h" -#include "application_manager/policies/policy_handler.h" +#include "application_manager/application_manager.h" #include "application_manager/message_helper.h" namespace application_manager { @@ -39,12 +39,10 @@ namespace application_manager { namespace commands { OnSystemInfoChangedNotification::OnSystemInfoChangedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnSystemInfoChangedNotification::~OnSystemInfoChangedNotification() { -} +OnSystemInfoChangedNotification::~OnSystemInfoChangedNotification() {} void OnSystemInfoChangedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,13 +50,11 @@ void OnSystemInfoChangedNotification::Run() { (*message_)[strings::msg_params][strings::language].asUInt(); const std::string language = application_manager::MessageHelper::CommonLanguageToString( - static_cast<hmi_apis::Common_Language::eType>(lang_code)); + static_cast<hmi_apis::Common_Language::eType>(lang_code)); - policy::PolicyHandler::instance()->OnSystemInfoChanged(language); + application_manager_.GetPolicyHandler().OnSystemInfoChanged(language); } } // namespace commands } // namespace application_manager - - diff --git a/src/components/application_manager/src/commands/hmi/on_system_request_notification.cc b/src/components/application_manager/src/commands/hmi/on_system_request_notification.cc index e464037136..b74f1b6799 100644 --- a/src/components/application_manager/src/commands/hmi/on_system_request_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_system_request_notification.cc @@ -31,25 +31,23 @@ */ #include "application_manager/application_impl.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/commands/hmi/on_system_request_notification.h" -#include "application_manager/policies/policy_handler.h" +#include "application_manager/policies/policy_handler_interface.h" #include "interfaces/MOBILE_API.h" #include "utils/macro.h" -using policy::PolicyHandler; +using policy::PolicyHandlerInterface; namespace application_manager { namespace commands { OnSystemRequestNotification::OnSystemRequestNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnSystemRequestNotification::~OnSystemRequestNotification() { -} +OnSystemRequestNotification::~OnSystemRequestNotification() {} void OnSystemRequestNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,26 +56,31 @@ void OnSystemRequestNotification::Run() { smart_objects::SmartObject& msg_params = (*message_)[strings::msg_params]; params[strings::function_id] = - static_cast<int32_t>(mobile_apis::FunctionID::eType::OnSystemRequestID); + static_cast<int32_t>(mobile_apis::FunctionID::eType::OnSystemRequestID); + // According to HMI API, this should be HMI unique id, but during processing + // messages from HMI this param is replaced by connection key, so below it + // will be treated as connection key ApplicationSharedPtr app; - if (!msg_params.keyExists(strings::app_id)) { + if (msg_params.keyExists(strings::app_id)) { + const uint32_t app_id = msg_params[strings::app_id].asUInt(); + LOG4CXX_DEBUG(logger_, "Received OnSystemRequest for appID " << app_id); + LOG4CXX_DEBUG(logger_, "Searching app to send OnSystemRequest by appID."); + app = application_manager_.application(app_id); + } else { LOG4CXX_DEBUG(logger_, - "No application specified, trying to choose automatically."); - PolicyHandler* policy_handler = PolicyHandler::instance(); - uint32_t selected_app_id = policy_handler->GetAppIdForSending(); + "Received OnSystemRequest without appID." + " One of registered apps will be used."); + LOG4CXX_DEBUG(logger_, "Searching registered app to send OnSystemRequest."); + const PolicyHandlerInterface& policy_handler = + application_manager_.GetPolicyHandler(); + const uint32_t selected_app_id = policy_handler.GetAppIdForSending(); if (0 == selected_app_id) { LOG4CXX_WARN(logger_, "Can't select application to forward OnSystemRequest."); return; } - ApplicationManagerImpl* app_mgr = ApplicationManagerImpl::instance(); - app = app_mgr->application(selected_app_id); - } else { - const uint32_t app_id = msg_params[strings::app_id].asUInt(); - LOG4CXX_WARN(logger_, "Looking for application with connection key " - << app_id); - app = ApplicationManagerImpl::instance()->application(app_id); + app = application_manager_.application(selected_app_id); } if (!app.valid()) { @@ -87,7 +90,7 @@ void OnSystemRequestNotification::Run() { } LOG4CXX_DEBUG(logger_, - "Sending request with application id " << app->mobile_app_id()); + "Sending request with application id " << app->policy_app_id()); params[strings::connection_key] = app->app_id(); SendNotificationToMobile(message_); @@ -96,4 +99,3 @@ void OnSystemRequestNotification::Run() { } // namespace commands } // namespace application_manager - 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 daa307d627..bd152c2af0 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 @@ -31,7 +31,7 @@ */ #include "application_manager/commands/hmi/on_tts_language_change_notification.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" #include "interfaces/MOBILE_API.h" @@ -41,18 +41,15 @@ namespace application_manager { namespace commands { OnTTSLanguageChangeNotification::OnTTSLanguageChangeNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnTTSLanguageChangeNotification::~OnTTSLanguageChangeNotification() { -} +OnTTSLanguageChangeNotification::~OnTTSLanguageChangeNotification() {} void OnTTSLanguageChangeNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_active_tts_language( static_cast<hmi_apis::Common_Language::eType>( @@ -70,20 +67,22 @@ void OnTTSLanguageChangeNotification::Run() { (*message_)[strings::params][strings::function_id] = static_cast<int32_t>(mobile_apis::FunctionID::OnLanguageChangeID); - ApplicationManagerImpl::ApplicationListAccessor accessor; - - ApplicationManagerImpl::ApplictionSetIt it = accessor.begin(); + const ApplicationSet& accessor = + application_manager_.applications().GetData(); + ApplicationSetIt it = accessor.begin(); for (; accessor.end() != it;) { ApplicationSharedPtr app = *it++; (*message_)[strings::params][strings::connection_key] = app->app_id(); SendNotificationToMobile(message_); - if (static_cast<int>(app->language()) - != (*message_)[strings::msg_params][strings::language].asInt()) { - MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile( - app->app_id(), - mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE); - ApplicationManagerImpl::instance()->UnregisterApplication( + if (static_cast<int>(app->language()) != + (*message_)[strings::msg_params][strings::language].asInt()) { + application_manager_.ManageMobileCommand( + MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( + app->app_id(), + mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), + commands::Command::ORIGIN_SDL); + application_manager_.UnregisterApplication( app->app_id(), mobile_apis::Result::SUCCESS, false); } } @@ -92,4 +91,3 @@ void OnTTSLanguageChangeNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_tts_reset_timeout_notification.cc b/src/components/application_manager/src/commands/hmi/on_tts_reset_timeout_notification.cc index 96089384c4..283e2056ba 100644 --- a/src/components/application_manager/src/commands/hmi/on_tts_reset_timeout_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_tts_reset_timeout_notification.cc @@ -9,18 +9,17 @@ namespace commands { namespace hmi { OnTTSResetTimeoutNotification::OnTTSResetTimeoutNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnTTSResetTimeoutNotification::~OnTTSResetTimeoutNotification() { -} +OnTTSResetTimeoutNotification::~OnTTSResetTimeoutNotification() {} void OnTTSResetTimeoutNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::TTS_OnResetTimeout); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace hmi @@ -28,4 +27,3 @@ void OnTTSResetTimeoutNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_tts_started_notification.cc b/src/components/application_manager/src/commands/hmi/on_tts_started_notification.cc index dc69246d5c..317465f354 100644 --- a/src/components/application_manager/src/commands/hmi/on_tts_started_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_tts_started_notification.cc @@ -31,28 +31,24 @@ */ #include "application_manager/commands/hmi/on_tts_started_notification.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { OnTTSStartedNotification::OnTTSStartedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnTTSStartedNotification::~OnTTSStartedNotification() { -} +OnTTSStartedNotification::~OnTTSStartedNotification() {} void OnTTSStartedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::TTS_Started); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_tts_stopped_notification.cc b/src/components/application_manager/src/commands/hmi/on_tts_stopped_notification.cc index 8d429ed179..7f763d8598 100644 --- a/src/components/application_manager/src/commands/hmi/on_tts_stopped_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_tts_stopped_notification.cc @@ -31,7 +31,7 @@ */ #include "application_manager/commands/hmi/on_tts_stopped_notification.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/event_engine/event.h" namespace application_manager { @@ -39,22 +39,19 @@ namespace application_manager { namespace commands { OnTTSStoppedNotification::OnTTSStoppedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnTTSStoppedNotification::~OnTTSStoppedNotification() { -} +OnTTSStoppedNotification::~OnTTSStoppedNotification() {} void OnTTSStoppedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::TTS_Stopped); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_ui_command_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_command_notification.cc index d8fe1ebdea..9f91d99a85 100644 --- a/src/components/application_manager/src/commands/hmi/on_ui_command_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_ui_command_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnUICommandNotification::OnUICommandNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnUICommandNotification::~OnUICommandNotification() { -} +OnUICommandNotification::~OnUICommandNotification() {} void OnUICommandNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -59,4 +57,3 @@ void OnUICommandNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_ui_keyboard_input_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_keyboard_input_notification.cc index 9dcfe01e60..117fec5741 100644 --- a/src/components/application_manager/src/commands/hmi/on_ui_keyboard_input_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_ui_keyboard_input_notification.cc @@ -40,18 +40,17 @@ namespace commands { namespace hmi { OnUIKeyBoardInputNotification::OnUIKeyBoardInputNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnUIKeyBoardInputNotification::~OnUIKeyBoardInputNotification() { -} +OnUIKeyBoardInputNotification::~OnUIKeyBoardInputNotification() {} void OnUIKeyBoardInputNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - //prepare SmartObject for mobile factory + // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = - mobile_apis::FunctionID::OnKeyboardInputID; + mobile_apis::FunctionID::OnKeyboardInputID; SendNotificationToMobile(message_); } @@ -60,4 +59,3 @@ void OnUIKeyBoardInputNotification::Run() { } // namespace commands } // namespace application_manager - 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 7e54099994..6e8e38f757 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 @@ -31,7 +31,7 @@ */ #include "application_manager/commands/hmi/on_ui_language_change_notification.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/application_impl.h" #include "application_manager/message_helper.h" #include "interfaces/MOBILE_API.h" @@ -41,18 +41,15 @@ namespace application_manager { namespace commands { OnUILanguageChangeNotification::OnUILanguageChangeNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnUILanguageChangeNotification::~OnUILanguageChangeNotification() { -} +OnUILanguageChangeNotification::~OnUILanguageChangeNotification() {} void OnUILanguageChangeNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_active_ui_language( static_cast<hmi_apis::Common_Language::eType>( @@ -67,21 +64,24 @@ void OnUILanguageChangeNotification::Run() { (*message_)[strings::params][strings::function_id] = static_cast<int32_t>(mobile_apis::FunctionID::OnLanguageChangeID); - ApplicationManagerImpl::ApplicationListAccessor accessor; + const ApplicationSet& accessor = + application_manager_.applications().GetData(); - ApplicationManagerImpl::ApplictionSetIt it = accessor.begin(); + ApplicationSetConstIt it = accessor.begin(); for (; accessor.end() != it;) { ApplicationSharedPtr app = *it++; (*message_)[strings::params][strings::connection_key] = app->app_id(); SendNotificationToMobile(message_); - if (app->ui_language() != (*message_)[strings::msg_params] - [strings::hmi_display_language].asInt()) { - - MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile( - app->app_id(), - mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE); - ApplicationManagerImpl::instance()->UnregisterApplication( + if (app->ui_language() != + (*message_)[strings::msg_params][strings::hmi_display_language] + .asInt()) { + application_manager_.ManageMobileCommand( + MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( + app->app_id(), + mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), + commands::Command::ORIGIN_SDL); + application_manager_.UnregisterApplication( app->app_id(), mobile_apis::Result::SUCCESS, false); } } @@ -90,4 +90,3 @@ void OnUILanguageChangeNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_ui_reset_timeout_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_reset_timeout_notification.cc index 96f65839c1..a5fea7bf8d 100644 --- a/src/components/application_manager/src/commands/hmi/on_ui_reset_timeout_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_ui_reset_timeout_notification.cc @@ -41,18 +41,17 @@ namespace commands { namespace hmi { OnUIResetTimeoutNotification::OnUIResetTimeoutNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnUIResetTimeoutNotification::~OnUIResetTimeoutNotification() { -} +OnUIResetTimeoutNotification::~OnUIResetTimeoutNotification() {} void OnUIResetTimeoutNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_OnResetTimeout); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace hmi @@ -60,4 +59,3 @@ void OnUIResetTimeoutNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_ui_touch_event_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_touch_event_notification.cc index 00e0e4d2c6..7709af8720 100644 --- a/src/components/application_manager/src/commands/hmi/on_ui_touch_event_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_ui_touch_event_notification.cc @@ -40,18 +40,17 @@ namespace commands { namespace hmi { OnUITouchEventNotification::OnUITouchEventNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnUITouchEventNotification::~OnUITouchEventNotification() { -} +OnUITouchEventNotification::~OnUITouchEventNotification() {} void OnUITouchEventNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - //prepare SmartObject for mobile factory + // prepare SmartObject for mobile factory (*message_)[strings::params][strings::function_id] = - mobile_apis::FunctionID::OnTouchEventID; + mobile_apis::FunctionID::OnTouchEventID; SendNotificationToMobile(message_); } @@ -60,4 +59,3 @@ void OnUITouchEventNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_update_device_list.cc b/src/components/application_manager/src/commands/hmi/on_update_device_list.cc index 8716fb4165..b245ea21aa 100644 --- a/src/components/application_manager/src/commands/hmi/on_update_device_list.cc +++ b/src/components/application_manager/src/commands/hmi/on_update_device_list.cc @@ -30,18 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/on_update_device_list.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { -OnUpdateDeviceList::OnUpdateDeviceList(const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} +OnUpdateDeviceList::OnUpdateDeviceList(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnUpdateDeviceList::~OnUpdateDeviceList() { -} +OnUpdateDeviceList::~OnUpdateDeviceList() {} void OnUpdateDeviceList::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -50,4 +48,3 @@ void OnUpdateDeviceList::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_acc_pedal_position_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_acc_pedal_position_notification.cc index f1e515e2f2..9b10055e2c 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_acc_pedal_position_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_acc_pedal_position_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIAccPedalPositionNotification::OnVIAccPedalPositionNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIAccPedalPositionNotification::~OnVIAccPedalPositionNotification() { -} +OnVIAccPedalPositionNotification::~OnVIAccPedalPositionNotification() {} void OnVIAccPedalPositionNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIAccPedalPositionNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_belt_status_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_belt_status_notification.cc index 0dd5361f74..58f9add514 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_belt_status_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_belt_status_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIBeltStatusNotification::OnVIBeltStatusNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIBeltStatusNotification::~OnVIBeltStatusNotification() { -} +OnVIBeltStatusNotification::~OnVIBeltStatusNotification() {} void OnVIBeltStatusNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIBeltStatusNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_body_information_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_body_information_notification.cc index 27c902c880..33f2944c38 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_body_information_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_body_information_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIBodyInformationNotification::OnVIBodyInformationNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIBodyInformationNotification::~OnVIBodyInformationNotification() { -} +OnVIBodyInformationNotification::~OnVIBodyInformationNotification() {} void OnVIBodyInformationNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIBodyInformationNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_device_status_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_device_status_notification.cc index 07b96f1011..9cbf612be1 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_device_status_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_device_status_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIDeviceStatusNotification::OnVIDeviceStatusNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIDeviceStatusNotification::~OnVIDeviceStatusNotification() { -} +OnVIDeviceStatusNotification::~OnVIDeviceStatusNotification() {} void OnVIDeviceStatusNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIDeviceStatusNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_driver_braking_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_driver_braking_notification.cc index 57a8f9c6ef..e521ac3a37 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_driver_braking_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_driver_braking_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIDriverBrakingNotification::OnVIDriverBrakingNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIDriverBrakingNotification::~OnVIDriverBrakingNotification() { -} +OnVIDriverBrakingNotification::~OnVIDriverBrakingNotification() {} void OnVIDriverBrakingNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIDriverBrakingNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_engine_torque_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_engine_torque_notification.cc index 7509884497..ebed955270 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_engine_torque_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_engine_torque_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIEngineTorqueNotification::OnVIEngineTorqueNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIEngineTorqueNotification::~OnVIEngineTorqueNotification() { -} +OnVIEngineTorqueNotification::~OnVIEngineTorqueNotification() {} void OnVIEngineTorqueNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIEngineTorqueNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_external_temperature_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_external_temperature_notification.cc index 64dd411bdd..9f0696fdc6 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_external_temperature_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_external_temperature_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIExternalTemperatureNotification::OnVIExternalTemperatureNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIExternalTemperatureNotification::~OnVIExternalTemperatureNotification() { -} +OnVIExternalTemperatureNotification::~OnVIExternalTemperatureNotification() {} void OnVIExternalTemperatureNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIExternalTemperatureNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_notification.cc index 59ecab0abc..ef650a9f99 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIFuelLevelNotification::OnVIFuelLevelNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIFuelLevelNotification::~OnVIFuelLevelNotification() { -} +OnVIFuelLevelNotification::~OnVIFuelLevelNotification() {} void OnVIFuelLevelNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIFuelLevelNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_state_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_state_notification.cc index faa8a0522a..a5267d8dac 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_state_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_fuel_level_state_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIFuelLevelStateNotification::OnVIFuelLevelStateNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIFuelLevelStateNotification::~OnVIFuelLevelStateNotification() { -} +OnVIFuelLevelStateNotification::~OnVIFuelLevelStateNotification() {} void OnVIFuelLevelStateNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIFuelLevelStateNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_gps_data_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_gps_data_notification.cc index df582418cb..63b95bf6dc 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_gps_data_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_gps_data_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIGpsDataNotification::OnVIGpsDataNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIGpsDataNotification::~OnVIGpsDataNotification() { -} +OnVIGpsDataNotification::~OnVIGpsDataNotification() {} void OnVIGpsDataNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIGpsDataNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_head_lamp_status_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_head_lamp_status_notification.cc index 01a0a725ef..7d494f02d3 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_head_lamp_status_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_head_lamp_status_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIHeadLampStatusNotification::OnVIHeadLampStatusNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIHeadLampStatusNotification::~OnVIHeadLampStatusNotification() { -} +OnVIHeadLampStatusNotification::~OnVIHeadLampStatusNotification() {} void OnVIHeadLampStatusNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIHeadLampStatusNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc index b13d50fc1c..a62f4cacea 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_instant_fuel_consumption_notification.cc @@ -38,12 +38,11 @@ namespace application_manager { namespace commands { OnVIInstantFuelConsumptionNotification::OnVIInstantFuelConsumptionNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIInstantFuelConsumptionNotification::~OnVIInstantFuelConsumptionNotification() { -} +OnVIInstantFuelConsumptionNotification:: + ~OnVIInstantFuelConsumptionNotification() {} void OnVIInstantFuelConsumptionNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +57,3 @@ void OnVIInstantFuelConsumptionNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_my_key_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_my_key_notification.cc index 71870522ce..229d50667b 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_my_key_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_my_key_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIMyKeyNotification::OnVIMyKeyNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIMyKeyNotification::~OnVIMyKeyNotification() { -} +OnVIMyKeyNotification::~OnVIMyKeyNotification() {} void OnVIMyKeyNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIMyKeyNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_odometer_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_odometer_notification.cc index 5db3ef3bb3..10f236539c 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_odometer_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_odometer_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIOdometerNotification::OnVIOdometerNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIOdometerNotification::~OnVIOdometerNotification() { -} +OnVIOdometerNotification::~OnVIOdometerNotification() {} void OnVIOdometerNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIOdometerNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_prndl_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_prndl_notification.cc index 1739f4809b..81585eabca 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_prndl_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_prndl_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIPrndlNotification::OnVIPrndlNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIPrndlNotification::~OnVIPrndlNotification() { -} +OnVIPrndlNotification::~OnVIPrndlNotification() {} void OnVIPrndlNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIPrndlNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_rpm_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_rpm_notification.cc index 336847ced0..b5c0703917 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_rpm_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_rpm_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIRpmNotification::OnVIRpmNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIRpmNotification::~OnVIRpmNotification() { -} +OnVIRpmNotification::~OnVIRpmNotification() {} void OnVIRpmNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIRpmNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_speed_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_speed_notification.cc index ad38bf50a5..aacafb71c9 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_speed_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_speed_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVISpeedNotification::OnVISpeedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVISpeedNotification::~OnVISpeedNotification() { -} +OnVISpeedNotification::~OnVISpeedNotification() {} void OnVISpeedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVISpeedNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc index 4fd70bf169..af102ea926 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_steering_wheel_angle_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVISteeringWheelAngleNotification::OnVISteeringWheelAngleNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVISteeringWheelAngleNotification::~OnVISteeringWheelAngleNotification() { -} +OnVISteeringWheelAngleNotification::~OnVISteeringWheelAngleNotification() {} void OnVISteeringWheelAngleNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVISteeringWheelAngleNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_tire_pressure_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_tire_pressure_notification.cc index fda6e6e28d..99506e6171 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_tire_pressure_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_tire_pressure_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVITirePressureNotification::OnVITirePressureNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVITirePressureNotification::~OnVITirePressureNotification() { -} +OnVITirePressureNotification::~OnVITirePressureNotification() {} void OnVITirePressureNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVITirePressureNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_vehicle_data_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_vehicle_data_notification.cc index 15ccf940b8..5f8109ccab 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_vehicle_data_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_vehicle_data_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIVehicleDataNotification::OnVIVehicleDataNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIVehicleDataNotification::~OnVIVehicleDataNotification() { -} +OnVIVehicleDataNotification::~OnVIVehicleDataNotification() {} void OnVIVehicleDataNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIVehicleDataNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_vin_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_vin_notification.cc index aa1683c5fb..c360e41dff 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_vin_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_vin_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIVinNotification::OnVIVinNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIVinNotification::~OnVIVinNotification() { -} +OnVIVinNotification::~OnVIVinNotification() {} void OnVIVinNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIVinNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vi_wiper_status_notification.cc b/src/components/application_manager/src/commands/hmi/on_vi_wiper_status_notification.cc index 0d27f42388..08fb3f31d4 100644 --- a/src/components/application_manager/src/commands/hmi/on_vi_wiper_status_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vi_wiper_status_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVIWiperStatusNotification::OnVIWiperStatusNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVIWiperStatusNotification::~OnVIWiperStatusNotification() { -} +OnVIWiperStatusNotification::~OnVIWiperStatusNotification() {} void OnVIWiperStatusNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -58,4 +56,3 @@ void OnVIWiperStatusNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_video_data_streaming_notification.cc b/src/components/application_manager/src/commands/hmi/on_video_data_streaming_notification.cc index 12642a75f2..ee0a91f5ef 100644 --- a/src/components/application_manager/src/commands/hmi/on_video_data_streaming_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_video_data_streaming_notification.cc @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { OnVideoDataStreamingNotification::OnVideoDataStreamingNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) {} -OnVideoDataStreamingNotification::~OnVideoDataStreamingNotification() { -} +OnVideoDataStreamingNotification::~OnVideoDataStreamingNotification() {} void OnVideoDataStreamingNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); diff --git a/src/components/application_manager/src/commands/hmi/on_vr_command_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_command_notification.cc index f8f9b4dfad..c609e2dc0a 100644 --- a/src/components/application_manager/src/commands/hmi/on_vr_command_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vr_command_notification.cc @@ -31,9 +31,11 @@ */ #include "application_manager/commands/hmi/on_vr_command_notification.h" -#include "application_manager/application_manager_impl.h" + +#include "application_manager/policies/policy_handler.h" #include "application_manager/message_helper.h" -#include "config_profile/profile.h" +#include "application_manager/state_controller.h" + #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" #include "application_manager/event_engine/event.h" @@ -43,29 +45,28 @@ namespace application_manager { namespace commands { OnVRCommandNotification::OnVRCommandNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVRCommandNotification::~OnVRCommandNotification() { -} +OnVRCommandNotification::~OnVRCommandNotification() {} void OnVRCommandNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - - ApplicationSharedPtr active_app = ApplicationManagerImpl::instance() - ->active_application(); - const uint32_t cmd_id = (*message_)[strings::msg_params][strings::cmd_id] - .asUInt(); - uint32_t max_cmd_id = profile::Profile::instance()->max_cmd_id(); + const uint32_t cmd_id = + (*message_)[strings::msg_params][strings::cmd_id].asUInt(); + uint32_t max_cmd_id = application_manager_.get_settings().max_cmd_id(); // Check if this is one of standart VR commands (i.e. "Help") if (cmd_id > max_cmd_id + 1) { LOG4CXX_INFO(logger_, "Switched App"); const uint32_t app_id = cmd_id - max_cmd_id; - ApplicationManagerImpl::instance()->SetState<true>(app_id, - mobile_apis::HMILevel::HMI_FULL - ); + ApplicationSharedPtr app = application_manager_.application(app_id); + if (app) { + application_manager_.state_controller().SetRegularState( + app, mobile_apis::HMILevel::HMI_FULL, true); + } else { + LOG4CXX_ERROR(logger_, "Unable to find appication " << app_id); + } return; } @@ -73,9 +74,9 @@ void OnVRCommandNotification::Run() { if (cmd_id == max_cmd_id + 1) { return; } - const uint32_t app_id = (*message_)[strings::msg_params][strings::app_id] - .asUInt(); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id); + const uint32_t app_id = + (*message_)[strings::msg_params][strings::app_id].asUInt(); + ApplicationSharedPtr app = application_manager_.application(app_id); if (!app) { LOG4CXX_ERROR(logger_, "NULL pointer"); return; @@ -87,7 +88,7 @@ void OnVRCommandNotification::Run() { if (0 != app->is_perform_interaction_active()) { event_engine::Event event(hmi_apis::FunctionID::VR_OnCommand); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } else { (*message_)[strings::params][strings::function_id] = static_cast<int32_t>(mobile_apis::FunctionID::eType::OnCommandID); @@ -101,4 +102,3 @@ void OnVRCommandNotification::Run() { } // namespace commands } // namespace application_manager - 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 9a146c19e7..bbdb55cde6 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 @@ -31,8 +31,9 @@ */ #include "application_manager/commands/hmi/on_vr_language_change_notification.h" -#include "application_manager/application_manager_impl.h" + #include "application_manager/application_impl.h" +#include "application_manager/state_controller.h" #include "application_manager/message_helper.h" #include "interfaces/MOBILE_API.h" @@ -41,18 +42,15 @@ namespace application_manager { namespace commands { OnVRLanguageChangeNotification::OnVRLanguageChangeNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVRLanguageChangeNotification::~OnVRLanguageChangeNotification() { -} +OnVRLanguageChangeNotification::~OnVRLanguageChangeNotification() {} void OnVRLanguageChangeNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_active_vr_language( static_cast<hmi_apis::Common_Language::eType>( @@ -64,23 +62,25 @@ void OnVRLanguageChangeNotification::Run() { (*message_)[strings::params][strings::function_id] = static_cast<int32_t>(mobile_apis::FunctionID::OnLanguageChangeID); - ApplicationManagerImpl::ApplicationListAccessor accessor; + const ApplicationSet& accessor = + application_manager_.applications().GetData(); - ApplicationManagerImpl::ApplictionSetIt it = accessor.begin(); + ApplicationSetConstIt it = accessor.begin(); for (; accessor.end() != it;) { ApplicationSharedPtr app = *it++; (*message_)[strings::params][strings::connection_key] = app->app_id(); SendNotificationToMobile(message_); - if (static_cast<int32_t>(app->language()) - != (*message_)[strings::msg_params][strings::language].asInt()) { - - ApplicationManagerImpl::instance()->SetState<false>(app->app_id(), - mobile_api::HMILevel::HMI_NONE); - - MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile( - app->app_id(), - mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE); - ApplicationManagerImpl::instance()->UnregisterApplication( + if (static_cast<int32_t>(app->language()) != + (*message_)[strings::msg_params][strings::language].asInt()) { + application_manager_.state_controller().SetRegularState( + app, mobile_api::HMILevel::HMI_NONE, false); + + application_manager_.ManageMobileCommand( + MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( + app->app_id(), + mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), + commands::Command::ORIGIN_SDL); + application_manager_.UnregisterApplication( app->app_id(), mobile_apis::Result::SUCCESS, false); } } @@ -89,4 +89,3 @@ void OnVRLanguageChangeNotification::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vr_started_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_started_notification.cc index 85994ad80e..68942fcf01 100644 --- a/src/components/application_manager/src/commands/hmi/on_vr_started_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vr_started_notification.cc @@ -31,29 +31,25 @@ */ #include "application_manager/commands/hmi/on_vr_started_notification.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { OnVRStartedNotification::OnVRStartedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVRStartedNotification::~OnVRStartedNotification() { -} +OnVRStartedNotification::~OnVRStartedNotification() {} void OnVRStartedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VR_Started); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/on_vr_stopped_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_stopped_notification.cc index 89bdc18eb3..e8f9fab847 100644 --- a/src/components/application_manager/src/commands/hmi/on_vr_stopped_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_vr_stopped_notification.cc @@ -31,29 +31,25 @@ */ #include "application_manager/commands/hmi/on_vr_stopped_notification.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { OnVRStoppedNotification::OnVRStoppedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) {} -OnVRStoppedNotification::~OnVRStoppedNotification() { -} +OnVRStoppedNotification::~OnVRStoppedNotification() {} void OnVRStoppedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VR_Stopped); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands } // namespace application_manager - 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 5713cf2a15..be3cd6314c 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 @@ -31,21 +31,22 @@ */ #include "application_manager/commands/hmi/request_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" +#include "utils/make_shared.h" namespace application_manager { namespace commands { -RequestFromHMI::RequestFromHMI(const MessageSharedPtr& message) - : CommandImpl(message) { - +RequestFromHMI::RequestFromHMI(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : CommandImpl(message, application_manager) + , EventObserver(application_manager.event_dispatcher()) { // Replace HMI app id with Mobile connection id - ApplicationManagerImpl::instance()->ReplaceHMIByMobileAppId(*(message.get())); + ReplaceHMIByMobileAppId(*(message.get())); } -RequestFromHMI::~RequestFromHMI() { -} +RequestFromHMI::~RequestFromHMI() {} bool RequestFromHMI::Init() { return true; @@ -55,27 +56,51 @@ bool RequestFromHMI::CleanUp() { return true; } -void RequestFromHMI::Run() { -} - -void RequestFromHMI::on_event(const event_engine::Event& event) { -} +void RequestFromHMI::Run() {} -void RequestFromHMI::SendResponse(uint32_t correlation_id, - hmi_apis::FunctionID::eType function_id, - hmi_apis::Common_Result::eType result_code) { - smart_objects::SmartObject* message = new smart_objects::SmartObject( - smart_objects::SmartType_Map); +void RequestFromHMI::on_event(const event_engine::Event& event) {} - (*message)[strings::params][strings::function_id] = function_id; +void RequestFromHMI::SendResponse( + const bool success, + const uint32_t correlation_id, + const hmi_apis::FunctionID::eType function_id, + const hmi_apis::Common_Result::eType result_code) { + smart_objects::SmartObject* message = + new smart_objects::SmartObject(smart_objects::SmartType_Map); + FillCommonParametersOfSO(message, correlation_id, function_id); (*message)[strings::params][strings::message_type] = MessageType::kResponse; - (*message)[strings::params][strings::correlation_id] = correlation_id; - (*message)[strings::params][hmi_response::code] = result_code; + (*message)[strings::params][hmi_response::code] = 0; + (*message)[strings::msg_params][strings::success] = success; + (*message)[strings::msg_params][strings::result_code] = result_code; - ApplicationManagerImpl::instance()->ManageHMICommand(message); + application_manager_.ManageHMICommand(message); } +// void RequestFromHMI::SendErrorResponse(uint32_t correlation_id, +// hmi_apis::FunctionID::eType +// function_id, +// hmi_apis::Common_Result::eType +// result_code) { +// smart_objects::SmartObject* message = new smart_objects::SmartObject( +// smart_objects::SmartType_Map); +// FillCommonParametersOfSO(message, correlation_id, function_id); +// (*message)[strings::params][strings::message_type] = +// MessageType::kErrorResponse; +// (*message)[strings::params][hmi_response::code] = result_code; +// (*message)[strings::params][strings::error_msg] = "HMIDeactivate is active"; + +// application_manager_.ManageHMICommand(message); +//} + +void RequestFromHMI::FillCommonParametersOfSO( + smart_objects::SmartObject* message, + uint32_t correlation_id, + hmi_apis::FunctionID::eType function_id) { + (*message)[strings::params][strings::function_id] = function_id; + (*message)[strings::params][strings::protocol_type] = hmi_protocol_type_; + (*message)[strings::params][strings::protocol_version] = protocol_version_; + (*message)[strings::params][strings::correlation_id] = correlation_id; +} } // namespace commands } // namespace application_manager - 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 82b36be0f0..2e7d7e9df1 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,21 +31,19 @@ */ #include "application_manager/commands/hmi/request_to_hmi.h" -#include "application_manager/application_manager_impl.h" -#include "config_profile/profile.h" namespace application_manager { namespace commands { -RequestToHMI::RequestToHMI(const MessageSharedPtr& message) - : CommandImpl(message) { +RequestToHMI::RequestToHMI(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : CommandImpl(message, application_manager) { // Replace Mobile connection id with HMI app id - ApplicationManagerImpl::instance()->ReplaceMobileByHMIAppId(*(message.get())); + ReplaceMobileByHMIAppId(*(message.get())); } -RequestToHMI::~RequestToHMI() { -} +RequestToHMI::~RequestToHMI() {} bool RequestToHMI::Init() { return true; @@ -55,14 +53,13 @@ bool RequestToHMI::CleanUp() { return true; } -void RequestToHMI::Run() { -} +void RequestToHMI::Run() {} void RequestToHMI::SendRequest() { (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - ApplicationManagerImpl::instance()->SendMessageToHMI(message_); + application_manager_.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 9f6ced5974..23d8e6e229 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,27 +31,27 @@ */ #include "application_manager/commands/hmi/response_from_hmi.h" -#include "application_manager/application_manager_impl.h" + #include "smart_objects/smart_object.h" namespace application_manager { namespace commands { -ResponseFromHMI::ResponseFromHMI(const MessageSharedPtr& message) - : CommandImpl(message) { - //If it is error response, shift info +ResponseFromHMI::ResponseFromHMI(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : CommandImpl(message, application_manager) { + // If it is error response, shift info if ((*message)[strings::params].keyExists(hmi_response::message)) { (*message)[strings::msg_params][strings::info] = (*message)[strings::params][hmi_response::message]; } // Replace HMI app id with Mobile connection id - ApplicationManagerImpl::instance()->ReplaceHMIByMobileAppId(*(message.get())); + ReplaceHMIByMobileAppId(*(message.get())); } -ResponseFromHMI::~ResponseFromHMI() { -} +ResponseFromHMI::~ResponseFromHMI() {} bool ResponseFromHMI::Init() { return true; @@ -61,19 +61,18 @@ bool ResponseFromHMI::CleanUp() { return true; } -void ResponseFromHMI::Run() { -} +void ResponseFromHMI::Run() {} -void ResponseFromHMI::SendResponseToMobile(const MessageSharedPtr& message) { +void ResponseFromHMI::SendResponseToMobile( + const MessageSharedPtr& message, ApplicationManager& application_manager) { (*message)[strings::params][strings::message_type] = MessageType::kResponse; - ApplicationManagerImpl::instance()->ManageMobileCommand(message); + application_manager_.ManageMobileCommand(message, ORIGIN_SDL); } void ResponseFromHMI::CreateHMIRequest( const hmi_apis::FunctionID::eType& function_id, const smart_objects::SmartObject& msg_params) const { - smart_objects::SmartObjectSPtr result = new smart_objects::SmartObject; if (!result) { @@ -82,8 +81,8 @@ void ResponseFromHMI::CreateHMIRequest( } // get hmi correlation id for chaining further request from this object - const uint32_t hmi_correlation_id_ = ApplicationManagerImpl::instance() - ->GetNextHMICorrelationID(); + const uint32_t hmi_correlation_id_ = + application_manager_.GetNextHMICorrelationID(); NsSmartDeviceLink::NsSmartObjects::SmartObject& request = *result; request[strings::params][strings::message_type] = MessageType::kRequest; @@ -96,7 +95,7 @@ void ResponseFromHMI::CreateHMIRequest( request[strings::msg_params] = msg_params; - if (!ApplicationManagerImpl::instance()->ManageHMICommand(result)) { + if (!application_manager_.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 d18987428e..e6f64047ba 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 @@ -31,20 +31,20 @@ */ #include "application_manager/commands/hmi/response_to_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { namespace commands { -ResponseToHMI::ResponseToHMI(const MessageSharedPtr& message) - : CommandImpl(message) { +ResponseToHMI::ResponseToHMI(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : CommandImpl(message, application_manager) { // Replace Mobile connection id with HMI app id - ApplicationManagerImpl::instance()->ReplaceMobileByHMIAppId(*(message.get())); + ReplaceMobileByHMIAppId(*(message.get())); } -ResponseToHMI::~ResponseToHMI() { -} +ResponseToHMI::~ResponseToHMI() {} bool ResponseToHMI::Init() { return true; @@ -58,9 +58,8 @@ void ResponseToHMI::Run() { (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - ApplicationManagerImpl::instance()->SendMessageToHMI(message_); + application_manager_.SendMessageToHMI(message_); } } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc index af55040ad1..30ea41e0b0 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,19 +31,58 @@ */ #include "application_manager/commands/hmi/sdl_activate_app_request.h" -#include "application_manager/policies/policy_handler.h" +#include "application_manager/state_controller.h" #include "application_manager/message_helper.h" namespace application_manager { namespace commands { -SDLActivateAppRequest::SDLActivateAppRequest(const MessageSharedPtr& message) - : RequestFromHMI(message) { +namespace { +struct ProtoV4AppsOnDevice : std::unary_function<ApplicationSharedPtr, bool> { + connection_handler::DeviceHandle handle_; + ProtoV4AppsOnDevice(const connection_handler::DeviceHandle handle) + : handle_(handle) {} + bool operator()(const ApplicationSharedPtr app) const { + return app + ? handle_ == app->device() && + ProtocolVersion::kV4 == app->protocol_version() + : false; + } +}; + +struct ForegroundApp + : std::unary_function<SDLActivateAppRequest::V4ProtoApps::value_type, + bool> { + bool operator()( + const SDLActivateAppRequest::V4ProtoApps::value_type ptr) const { + return ptr ? ptr->is_foreground() : false; + } +}; + +struct SendLaunchApp + : std::unary_function<SDLActivateAppRequest::V4ProtoApps::value_type, + void> { + ApplicationConstSharedPtr app_to_launch_; + ApplicationManager& application_manager_; + SendLaunchApp(ApplicationConstSharedPtr app_to_launch, ApplicationManager& am) + : app_to_launch_(app_to_launch), application_manager_(am) {} + void operator()( + const SDLActivateAppRequest::V4ProtoApps::value_type ptr) const { + MessageHelper::SendLaunchApp((*ptr).app_id(), + app_to_launch_->SchemaUrl(), + app_to_launch_->PackageName(), + application_manager_); + return; + } +}; } -SDLActivateAppRequest::~SDLActivateAppRequest() { -} +SDLActivateAppRequest::SDLActivateAppRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestFromHMI(message, application_manager) {} + +SDLActivateAppRequest::~SDLActivateAppRequest() {} void SDLActivateAppRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,49 +91,73 @@ void SDLActivateAppRequest::Run() { const uint32_t application_id = app_id(); - ApplicationConstSharedPtr app = - ApplicationManagerImpl::instance()->application(application_id); + ApplicationConstSharedPtr app_to_activate = + application_manager_.application(application_id); + + if (!app_to_activate) { + LOG4CXX_WARN( + logger_, + "Can't find application within regular apps: " << application_id); + + // Here is the hack - in fact SDL gets hmi_app_id in appID field and + // replaces it with connection_key only for normally registered apps, but + // for apps_to_be_registered (waiting) it keeps original value (hmi_app_id) + // so method does lookup for hmi_app_id + app_to_activate = + application_manager_.WaitingApplicationByID(application_id); + + if (!app_to_activate) { + LOG4CXX_WARN( + logger_, + "Can't find application within waiting apps: " << application_id); + return; + } + } + + LOG4CXX_DEBUG(logger_, + "Found application to activate. Application id is " + << app_to_activate->app_id()); - if (!app) { - LOG4CXX_WARN(logger_, "Can't find application within regular apps: " - << application_id); + if (app_to_activate->IsRegistered()) { + LOG4CXX_DEBUG(logger_, "Application is registered. Activating."); + application_manager_.GetPolicyHandler().OnActivateApp(application_id, + correlation_id()); + return; + } - app = ApplicationManagerImpl::instance()->waiting_app(application_id); + connection_handler::DeviceHandle device_handle = app_to_activate->device(); + ApplicationSharedPtr foreground_v4_app = get_foreground_app(device_handle); + V4ProtoApps v4_proto_apps = get_v4_proto_apps(device_handle); - if (!app) { - LOG4CXX_WARN(logger_, "Can't find application within waiting apps: " - << application_id); - return; - } + if (!foreground_v4_app && v4_proto_apps.empty()) { + LOG4CXX_ERROR(logger_, + "Can't find regular foreground app with the same " + "connection id:" + << device_handle); + SendResponse(false, correlation_id(), SDL_ActivateApp, NO_APPS_REGISTERED); + return; } - if (!app->IsRegistered()) { - DevicesApps devices_apps = - FindAllAppOnParticularDevice(app->device()); - if (!devices_apps.first && devices_apps.second.empty()) { - LOG4CXX_ERROR(logger_, "Can't find regular foreground app with the same " - "connection id:" << app->device()); - SendResponse(correlation_id(), - SDL_ActivateApp, NO_APPS_REGISTERED); - return; - } - if (devices_apps.first) { - MessageHelper::SendLaunchApp(devices_apps.first->app_id(), - app->SchemaUrl(), - app->PackageName()); - } else { - std::vector<ApplicationSharedPtr>::const_iterator it = devices_apps.second.begin(); - for (; it != devices_apps.second.end(); ++it) { - MessageHelper::SendLaunchApp((*it)->app_id(), - app->SchemaUrl(), - app->PackageName()); - } - } - subscribe_on_event(BasicCommunication_OnAppRegistered); + LOG4CXX_DEBUG(logger_, + "Application is not registered yet. " + "Sending launch request."); + + if (foreground_v4_app) { + LOG4CXX_DEBUG(logger_, "Sending request to foreground application."); + MessageHelper::SendLaunchApp(foreground_v4_app->app_id(), + app_to_activate->SchemaUrl(), + app_to_activate->PackageName(), + application_manager_); } else { - policy::PolicyHandler::instance()->OnActivateApp(application_id, - correlation_id()); + LOG4CXX_DEBUG(logger_, + "No preffered (foreground) application is found. " + "Sending request to all v4 applications."); + std::for_each(v4_proto_apps.begin(), + v4_proto_apps.end(), + SendLaunchApp(app_to_activate, application_manager_)); } + + subscribe_on_event(BasicCommunication_OnAppRegistered); } void SDLActivateAppRequest::onTimeOut() { @@ -102,8 +165,8 @@ void SDLActivateAppRequest::onTimeOut() { using namespace hmi_apis::Common_Result; using namespace application_manager; unsubscribe_from_event(BasicCommunication_OnAppRegistered); - SendResponse(correlation_id(), - SDL_ActivateApp, APPLICATION_NOT_REGISTERED); + SendResponse( + false, correlation_id(), SDL_ActivateApp, APPLICATION_NOT_REGISTERED); } void SDLActivateAppRequest::on_event(const event_engine::Event& event) { @@ -119,64 +182,68 @@ void SDLActivateAppRequest::on_event(const event_engine::Event& event) { const uint32_t hmi_application_id = hmi_app_id(event.smart_object()); ApplicationSharedPtr app = - application_manager::ApplicationManagerImpl::instance()-> - application_by_hmi_app(hmi_application_id); + application_manager_.application_by_hmi_app(hmi_application_id); if (!app) { - LOG4CXX_ERROR(logger_, "Application not found by HMI app id: " - << hmi_application_id); + LOG4CXX_ERROR( + logger_, "Application not found by HMI app id: " << hmi_application_id); return; } - policy::PolicyHandler::instance()->OnActivateApp(app->app_id(), - correlation_id()); + application_manager_.GetPolicyHandler().OnActivateApp(app->app_id(), + correlation_id()); } uint32_t SDLActivateAppRequest::app_id() const { - if ((*message_).keyExists(strings::msg_params)) { - if ((*message_)[strings::msg_params].keyExists(strings::app_id)){ - return (*message_)[strings::msg_params][strings::app_id].asUInt(); - } + using namespace strings; + if (!(*message_).keyExists(msg_params)) { + LOG4CXX_DEBUG(logger_, msg_params << " section is absent in the message."); + return 0; } - LOG4CXX_DEBUG(logger_, "app_id section is absent in the message."); - return 0; + if (!(*message_)[msg_params].keyExists(strings::app_id)) { + LOG4CXX_DEBUG(logger_, + strings::app_id << " section is absent in the message."); + return 0; + } + return (*message_)[msg_params][strings::app_id].asUInt(); } uint32_t SDLActivateAppRequest::hmi_app_id( const smart_objects::SmartObject& so) const { - if (so.keyExists(strings::params)) { - if (so[strings::msg_params].keyExists(strings::application)){ - if (so[strings::msg_params][strings::application]. - keyExists(strings::app_id)) { - return so[strings::msg_params][strings::application] - [strings::app_id].asUInt(); - } - } + using namespace strings; + if (!so.keyExists(params)) { + LOG4CXX_DEBUG(logger_, params << " section is absent in the message."); + return 0; } - LOG4CXX_DEBUG(logger_, "Can't find app_id section is absent in the message."); - return 0; + if (!so[msg_params].keyExists(application)) { + LOG4CXX_DEBUG(logger_, application << " section is absent in the message."); + return 0; + } + if (so[msg_params][application].keyExists(strings::app_id)) { + LOG4CXX_DEBUG(logger_, + strings::app_id << " section is absent in the message."); + return 0; + } + return so[msg_params][application][strings::app_id].asUInt(); } -DevicesApps -SDLActivateAppRequest::FindAllAppOnParticularDevice( - const connection_handler::DeviceHandle handle) { - DevicesApps apps; - - ApplicationManagerImpl::ApplicationListAccessor accessor; - ApplicationManagerImpl::ApplictionSet app_list = accessor.GetData(); - - ApplicationManagerImpl::ApplictionSetIt it = app_list.begin(); - ApplicationManagerImpl::ApplictionSetIt it_end = app_list.end(); +SDLActivateAppRequest::V4ProtoApps SDLActivateAppRequest::get_v4_proto_apps( + const connection_handler::DeviceHandle handle) const { + const ApplicationSet app_list = application_manager_.applications().GetData(); + V4ProtoApps v4_proto_apps; + std::copy_if(app_list.begin(), + app_list.end(), + std::back_inserter(v4_proto_apps), + ProtoV4AppsOnDevice(handle)); + return v4_proto_apps; +} - for (;it != it_end; ++it) { - if (handle == (*it)->device()) { - if ((*it)->is_foreground()) { - apps.first = *it; - } - apps.second.push_back(*it); - } - } - return apps; +ApplicationSharedPtr SDLActivateAppRequest::get_foreground_app( + const connection_handler::DeviceHandle handle) const { + V4ProtoApps v4_proto_apps = get_v4_proto_apps(handle); + V4ProtoApps::iterator foreground_app = + std::find_if(v4_proto_apps.begin(), v4_proto_apps.end(), ForegroundApp()); + return foreground_app != v4_proto_apps.end() ? *foreground_app + : ApplicationSharedPtr(); } } // namespace commands } // namespace application_manager - 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 6c7a0b5355..75a8c0b241 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,28 +31,24 @@ */ #include "application_manager/commands/hmi/sdl_activate_app_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { SDLActivateAppResponse::SDLActivateAppResponse( - const MessageSharedPtr& message): ResponseToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseToHMI(message, application_manager) {} -SDLActivateAppResponse::~SDLActivateAppResponse() { -} +SDLActivateAppResponse::~SDLActivateAppResponse() {} void SDLActivateAppResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - ApplicationManagerImpl::instance()->SendMessageToHMI(message_); + application_manager_.SendMessageToHMI(message_); } } // namespace commands } // namespace application_manager - - diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_request.cc b/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_request.cc index a6649b2579..4b150cda60 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_request.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_get_list_of_permissions_request.cc @@ -31,19 +31,17 @@ */ #include "application_manager/commands/hmi/sdl_get_list_of_permissions_request.h" -#include "application_manager/policies/policy_handler.h" +#include "application_manager/application_manager.h" namespace application_manager { namespace commands { SDLGetListOfPermissionsRequest::SDLGetListOfPermissionsRequest( - const MessageSharedPtr& message) - : RequestFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestFromHMI(message, application_manager) {} -SDLGetListOfPermissionsRequest::~SDLGetListOfPermissionsRequest() { -} +SDLGetListOfPermissionsRequest::~SDLGetListOfPermissionsRequest() {} void SDLGetListOfPermissionsRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -51,12 +49,10 @@ void SDLGetListOfPermissionsRequest::Run() { if ((*message_)[strings::msg_params].keyExists(strings::app_id)) { connection_key = (*message_)[strings::msg_params][strings::app_id].asUInt(); } - policy::PolicyHandler::instance()->OnGetListOfPermissions( - connection_key, - (*message_)[strings::params][strings::correlation_id].asUInt()); + application_manager_.GetPolicyHandler().OnGetListOfPermissions( + connection_key, + (*message_)[strings::params][strings::correlation_id].asUInt()); } } // namespace commands } // namespace application_manager - - 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 5d5e75e5c7..521b59a0ec 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,28 +31,24 @@ */ #include "application_manager/commands/hmi/sdl_get_list_of_permissions_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { SDLGetListOfPermissionsResponse::SDLGetListOfPermissionsResponse( - const MessageSharedPtr& message): ResponseToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseToHMI(message, application_manager) {} -SDLGetListOfPermissionsResponse::~SDLGetListOfPermissionsResponse() { -} +SDLGetListOfPermissionsResponse::~SDLGetListOfPermissionsResponse() {} void SDLGetListOfPermissionsResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - ApplicationManagerImpl::instance()->SendMessageToHMI(message_); + application_manager_.SendMessageToHMI(message_); } } // namespace commands } // namespace application_manager - - diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_status_update_request.cc b/src/components/application_manager/src/commands/hmi/sdl_get_status_update_request.cc index dd977d99f0..afa7569746 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_get_status_update_request.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_get_status_update_request.cc @@ -31,26 +31,23 @@ */ #include "application_manager/commands/hmi/sdl_get_status_update_request.h" -#include "application_manager/policies/policy_handler.h" +#include "application_manager/application_manager.h" namespace application_manager { namespace commands { -SDLGetStatusUpdateRequest::SDLGetStatusUpdateRequest(const MessageSharedPtr& message) - : RequestFromHMI(message) { -} +SDLGetStatusUpdateRequest::SDLGetStatusUpdateRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestFromHMI(message, application_manager) {} -SDLGetStatusUpdateRequest::~SDLGetStatusUpdateRequest() { -} +SDLGetStatusUpdateRequest::~SDLGetStatusUpdateRequest() {} void SDLGetStatusUpdateRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - policy::PolicyHandler::instance()->OnGetStatusUpdate( - (*message_)[strings::params][strings::correlation_id].asUInt()); + application_manager_.GetPolicyHandler().OnGetStatusUpdate( + (*message_)[strings::params][strings::correlation_id].asUInt()); } } // namespace commands } // namespace application_manager - - 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 ab1c57e9af..0af7e0217a 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,29 +31,24 @@ */ #include "application_manager/commands/hmi/sdl_get_status_update_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { SDLGetStatusUpdateResponse::SDLGetStatusUpdateResponse( - const MessageSharedPtr& message): ResponseToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseToHMI(message, application_manager) {} -SDLGetStatusUpdateResponse::~SDLGetStatusUpdateResponse() { -} +SDLGetStatusUpdateResponse::~SDLGetStatusUpdateResponse() {} void SDLGetStatusUpdateResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - ApplicationManagerImpl::instance()->SendMessageToHMI(message_); + application_manager_.SendMessageToHMI(message_); } } // namespace commands } // namespace application_manager - - - diff --git a/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_request.cc b/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_request.cc index cdd5c16ed0..ea959389ef 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_request.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_get_user_friendly_message_request.cc @@ -31,28 +31,24 @@ */ #include "application_manager/commands/hmi/sdl_get_user_friendly_message_request.h" -#include "application_manager/application_manager_impl.h" #include "application_manager/message_helper.h" -#include "application_manager/policies/policy_handler.h" namespace application_manager { namespace commands { SDLGetUserFriendlyMessageRequest::SDLGetUserFriendlyMessageRequest( - const MessageSharedPtr& message) - : RequestFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestFromHMI(message, application_manager) {} -SDLGetUserFriendlyMessageRequest::~SDLGetUserFriendlyMessageRequest() { -} +SDLGetUserFriendlyMessageRequest::~SDLGetUserFriendlyMessageRequest() {} void SDLGetUserFriendlyMessageRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); const std::string messageCodes = "messageCodes"; if (!(*message_)[strings::msg_params].keyExists(messageCodes)) { LOG4CXX_WARN(logger_, - "Mandatory parameter '"+messageCodes+"'' is missing"); + "Mandatory parameter '" + messageCodes + "'' is missing"); return; } smart_objects::SmartArray* msg = @@ -68,26 +64,24 @@ void SDLGetUserFriendlyMessageRequest::Run() { std::string required_language; if ((*message_)[strings::msg_params].keyExists(strings::language)) { - uint32_t lang_code = (*message_)[strings::msg_params][strings::language] - .asUInt(); + uint32_t lang_code = + (*message_)[strings::msg_params][strings::language].asUInt(); required_language = application_manager::MessageHelper::CommonLanguageToString( - static_cast<hmi_apis::Common_Language::eType>(lang_code)); + static_cast<hmi_apis::Common_Language::eType>(lang_code)); } else { hmi_apis::Common_Language::eType ui_language = - application_manager::ApplicationManagerImpl::instance() - ->hmi_capabilities().active_ui_language(); + application_manager_.hmi_capabilities().active_ui_language(); required_language = application_manager::MessageHelper::CommonLanguageToString(ui_language); } - policy::PolicyHandler::instance()->OnGetUserFriendlyMessage( - msg_codes, required_language, - (*message_)[strings::params][strings::correlation_id].asInt()); + application_manager_.GetPolicyHandler().OnGetUserFriendlyMessage( + msg_codes, + required_language, + (*message_)[strings::params][strings::correlation_id].asInt()); } } // namespace commands } // namespace application_manager - - 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 8cc1b2d629..c693625dbb 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,28 +31,24 @@ */ #include "application_manager/commands/hmi/sdl_get_user_friendly_message_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { SDLGetUserFriendlyMessageResponse::SDLGetUserFriendlyMessageResponse( - const MessageSharedPtr& message): ResponseToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseToHMI(message, application_manager) {} -SDLGetUserFriendlyMessageResponse::~SDLGetUserFriendlyMessageResponse() { -} +SDLGetUserFriendlyMessageResponse::~SDLGetUserFriendlyMessageResponse() {} void SDLGetUserFriendlyMessageResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - ApplicationManagerImpl::instance()->SendMessageToHMI(message_); + application_manager_.SendMessageToHMI(message_); } } // namespace commands } // namespace application_manager - - diff --git a/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc b/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc index e1fe835224..e79bca14de 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc @@ -36,8 +36,9 @@ namespace application_manager { namespace commands { -SDLPolicyUpdate::SDLPolicyUpdate(const MessageSharedPtr& message) - : RequestToHMI(message) {} +SDLPolicyUpdate::SDLPolicyUpdate(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} SDLPolicyUpdate::~SDLPolicyUpdate() {} diff --git a/src/components/application_manager/src/commands/hmi/sdl_policy_update_response.cc b/src/components/application_manager/src/commands/hmi/sdl_policy_update_response.cc index bc7c6e0d74..38b57a5b9f 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_policy_update_response.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_policy_update_response.cc @@ -36,11 +36,10 @@ namespace application_manager { namespace commands { SDLPolicyUpdateResponse::SDLPolicyUpdateResponse( - const MessageSharedPtr& message): ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -SDLPolicyUpdateResponse::~SDLPolicyUpdateResponse() { -} +SDLPolicyUpdateResponse::~SDLPolicyUpdateResponse() {} void SDLPolicyUpdateResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); diff --git a/src/components/application_manager/src/commands/hmi/tts_change_registration_request.cc b/src/components/application_manager/src/commands/hmi/tts_change_registration_request.cc index dd127ec43f..bb1f29d889 100644 --- a/src/components/application_manager/src/commands/hmi/tts_change_registration_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_change_registration_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { TTSChangeRegistrationRequest::TTSChangeRegistrationRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -TTSChangeRegistrationRequest::~TTSChangeRegistrationRequest() { -} +TTSChangeRegistrationRequest::~TTSChangeRegistrationRequest() {} void TTSChangeRegistrationRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void TTSChangeRegistrationRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/tts_change_registration_response.cc b/src/components/application_manager/src/commands/hmi/tts_change_registration_response.cc index 03b51e5db7..e63ee5f74d 100644 --- a/src/components/application_manager/src/commands/hmi/tts_change_registration_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_change_registration_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/tts_change_registration_response.h" #include "application_manager/event_engine/event.h" + #include "interfaces/HMI_API.h" namespace application_manager { @@ -38,19 +39,17 @@ namespace application_manager { namespace commands { TTSChangeRegistratioResponse::TTSChangeRegistratioResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -TTSChangeRegistratioResponse::~TTSChangeRegistratioResponse() { -} +TTSChangeRegistratioResponse::~TTSChangeRegistratioResponse() {} void TTSChangeRegistratioResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::TTS_ChangeRegistration); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/tts_get_capabilities_request.cc b/src/components/application_manager/src/commands/hmi/tts_get_capabilities_request.cc index fb3dedc1c0..4dbf5e8ee7 100644 --- a/src/components/application_manager/src/commands/hmi/tts_get_capabilities_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_get_capabilities_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { TTSGetCapabilitiesRequest::TTSGetCapabilitiesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -TTSGetCapabilitiesRequest::~TTSGetCapabilitiesRequest() { -} +TTSGetCapabilitiesRequest::~TTSGetCapabilitiesRequest() {} void TTSGetCapabilitiesRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void TTSGetCapabilitiesRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/tts_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/tts_get_capabilities_response.cc index 53a1bd3916..ce629b36d7 100644 --- a/src/components/application_manager/src/commands/hmi/tts_get_capabilities_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_get_capabilities_response.cc @@ -30,36 +30,32 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/tts_get_capabilities_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { TTSGetCapabilitiesResponse::TTSGetCapabilitiesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -TTSGetCapabilitiesResponse::~TTSGetCapabilitiesResponse() { -} +TTSGetCapabilitiesResponse::~TTSGetCapabilitiesResponse() {} void TTSGetCapabilitiesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); - if ((*message_)[strings::msg_params].keyExists(hmi_response::speech_capabilities)) { + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); + if ((*message_)[strings::msg_params].keyExists( + hmi_response::speech_capabilities)) { hmi_capabilities.set_speech_capabilities( - (*message_)[strings::msg_params][hmi_response::speech_capabilities]); + (*message_)[strings::msg_params][hmi_response::speech_capabilities]); } if ((*message_)[strings::msg_params].keyExists( - hmi_response::prerecorded_speech_capabilities)) { + hmi_response::prerecorded_speech_capabilities)) { hmi_capabilities.set_prerecorded_speech( (*message_)[strings::msg_params] - [hmi_response::prerecorded_speech_capabilities]); + [hmi_response::prerecorded_speech_capabilities]); } - } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/tts_get_language_request.cc b/src/components/application_manager/src/commands/hmi/tts_get_language_request.cc index 6d4e4f465a..c44667a223 100644 --- a/src/components/application_manager/src/commands/hmi/tts_get_language_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_get_language_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -TTSGetLanguageRequest::TTSGetLanguageRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +TTSGetLanguageRequest::TTSGetLanguageRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -TTSGetLanguageRequest::~TTSGetLanguageRequest() { -} +TTSGetLanguageRequest::~TTSGetLanguageRequest() {} void TTSGetLanguageRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void TTSGetLanguageRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/tts_get_language_response.cc b/src/components/application_manager/src/commands/hmi/tts_get_language_response.cc index 6c2122557b..37aed2c6cb 100644 --- a/src/components/application_manager/src/commands/hmi/tts_get_language_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_get_language_response.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,28 +30,40 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/tts_get_language_response.h" -#include "application_manager/application_manager_impl.h" + +#include "application_manager/event_engine/event.h" namespace application_manager { namespace commands { -TTSGetLanguageResponse::TTSGetLanguageResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +TTSGetLanguageResponse::TTSGetLanguageResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -TTSGetLanguageResponse::~TTSGetLanguageResponse() { -} +TTSGetLanguageResponse::~TTSGetLanguageResponse() {} void TTSGetLanguageResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); + using namespace hmi_apis; + + Common_Language::eType language = Common_Language::INVALID_ENUM; + + if ((*message_).keyExists(strings::msg_params) && + (*message_)[strings::msg_params].keyExists(hmi_response::language)) { + language = static_cast<Common_Language::eType>( + (*message_)[strings::msg_params][hmi_response::language].asInt()); + } - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + application_manager_.hmi_capabilities().set_active_tts_language(language); - hmi_capabilities.set_active_tts_language( - static_cast<hmi_apis::Common_Language::eType>( - (*message_)[strings::msg_params][hmi_response::language].asInt())); + LOG4CXX_DEBUG(logger_, + "Raising event for function_id " << function_id() + << " and correlation_id " + << correlation_id()); + event_engine::Event event(FunctionID::TTS_GetLanguage); + event.set_smart_object(*message_); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_request.cc b/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_request.cc index 5251832bc1..941adca01d 100644 --- a/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { TTSGetSupportedLanguagesRequest::TTSGetSupportedLanguagesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -TTSGetSupportedLanguagesRequest::~TTSGetSupportedLanguagesRequest() { -} +TTSGetSupportedLanguagesRequest::~TTSGetSupportedLanguagesRequest() {} void TTSGetSupportedLanguagesRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void TTSGetSupportedLanguagesRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_response.cc b/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_response.cc index a5d022a6cb..79af1d3cc2 100644 --- a/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/tts_get_supported_languages_response.h" -#include "application_manager/application_manager_impl.h" + #include "interfaces/HMI_API.h" namespace application_manager { @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { TTSGetSupportedLanguagesResponse::TTSGetSupportedLanguagesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -TTSGetSupportedLanguagesResponse::~TTSGetSupportedLanguagesResponse() { -} +TTSGetSupportedLanguagesResponse::~TTSGetSupportedLanguagesResponse() {} void TTSGetSupportedLanguagesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,8 +51,7 @@ void TTSGetSupportedLanguagesResponse::Run() { (*message_)[strings::params][hmi_response::code].asInt()); if (hmi_apis::Common_Result::SUCCESS == code) { - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_tts_supported_languages( (*message_)[strings::msg_params][hmi_response::languages]); 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 3a50cfef90..e7fd335808 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 @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -TTSIsReadyRequest::TTSIsReadyRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +TTSIsReadyRequest::TTSIsReadyRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -TTSIsReadyRequest::~TTSIsReadyRequest() { -} +TTSIsReadyRequest::~TTSIsReadyRequest() {} void TTSIsReadyRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void TTSIsReadyRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/tts_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/tts_is_ready_response.cc index dd8eab7534..91efb293c9 100644 --- a/src/components/application_manager/src/commands/hmi/tts_is_ready_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_is_ready_response.cc @@ -30,18 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/tts_is_ready_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { -TTSIsReadyResponse::TTSIsReadyResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +TTSIsReadyResponse::TTSIsReadyResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -TTSIsReadyResponse::~TTSIsReadyResponse() { -} +TTSIsReadyResponse::~TTSIsReadyResponse() {} void TTSIsReadyResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,8 +50,7 @@ void TTSIsReadyResponse::Run() { is_available = object[strings::msg_params][strings::available].asBool(); } - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_is_tts_cooperating(is_available); } diff --git a/src/components/application_manager/src/commands/hmi/tts_set_global_properties_request.cc b/src/components/application_manager/src/commands/hmi/tts_set_global_properties_request.cc index ce330c355f..bf035ffe23 100644 --- a/src/components/application_manager/src/commands/hmi/tts_set_global_properties_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_set_global_properties_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { TTSSetGlobalPropertiesRequest::TTSSetGlobalPropertiesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -TTSSetGlobalPropertiesRequest::~TTSSetGlobalPropertiesRequest() { -} +TTSSetGlobalPropertiesRequest::~TTSSetGlobalPropertiesRequest() {} void TTSSetGlobalPropertiesRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void TTSSetGlobalPropertiesRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/tts_set_global_properties_response.cc b/src/components/application_manager/src/commands/hmi/tts_set_global_properties_response.cc index 70dc46d6a6..f494fb1a8e 100644 --- a/src/components/application_manager/src/commands/hmi/tts_set_global_properties_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_set_global_properties_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/tts_set_global_properties_response.h" #include "application_manager/event_engine/event.h" + #include "interfaces/HMI_API.h" namespace application_manager { @@ -38,19 +39,17 @@ namespace application_manager { namespace commands { TTSSetGlobalPropertiesResponse::TTSSetGlobalPropertiesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -TTSSetGlobalPropertiesResponse::~TTSSetGlobalPropertiesResponse() { -} +TTSSetGlobalPropertiesResponse::~TTSSetGlobalPropertiesResponse() {} void TTSSetGlobalPropertiesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::TTS_SetGlobalProperties); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/tts_speak_request.cc b/src/components/application_manager/src/commands/hmi/tts_speak_request.cc index 79fbde2c4f..2e386449d0 100644 --- a/src/components/application_manager/src/commands/hmi/tts_speak_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_speak_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -TTSSpeakRequest::TTSSpeakRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +TTSSpeakRequest::TTSSpeakRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -TTSSpeakRequest::~TTSSpeakRequest() { -} +TTSSpeakRequest::~TTSSpeakRequest() {} void TTSSpeakRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void TTSSpeakRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/tts_speak_response.cc b/src/components/application_manager/src/commands/hmi/tts_speak_response.cc index ff60115e70..5cffdccf34 100644 --- a/src/components/application_manager/src/commands/hmi/tts_speak_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_speak_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/tts_speak_response.h" #include "application_manager/event_engine/event.h" + #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" @@ -38,19 +39,18 @@ namespace application_manager { namespace commands { -TTSSpeakResponse::TTSSpeakResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +TTSSpeakResponse::TTSSpeakResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -TTSSpeakResponse::~TTSSpeakResponse() { -} +TTSSpeakResponse::~TTSSpeakResponse() {} void TTSSpeakResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::TTS_Speak); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/tts_stop_speaking_request.cc b/src/components/application_manager/src/commands/hmi/tts_stop_speaking_request.cc index 32aaec27e7..c2275dda72 100644 --- a/src/components/application_manager/src/commands/hmi/tts_stop_speaking_request.cc +++ b/src/components/application_manager/src/commands/hmi/tts_stop_speaking_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -TTSStopSpeakingRequest::TTSStopSpeakingRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +TTSStopSpeakingRequest::TTSStopSpeakingRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -TTSStopSpeakingRequest::~TTSStopSpeakingRequest() { -} +TTSStopSpeakingRequest::~TTSStopSpeakingRequest() {} void TTSStopSpeakingRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void TTSStopSpeakingRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/tts_stop_speaking_response.cc b/src/components/application_manager/src/commands/hmi/tts_stop_speaking_response.cc index b32cf52bb5..67d747f464 100644 --- a/src/components/application_manager/src/commands/hmi/tts_stop_speaking_response.cc +++ b/src/components/application_manager/src/commands/hmi/tts_stop_speaking_response.cc @@ -38,19 +38,17 @@ namespace application_manager { namespace commands { TTSStopSpeakingResponse::TTSStopSpeakingResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -TTSStopSpeakingResponse::~TTSStopSpeakingResponse() { -} +TTSStopSpeakingResponse::~TTSStopSpeakingResponse() {} void TTSStopSpeakingResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::TTS_StopSpeaking); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_add_command_request.cc b/src/components/application_manager/src/commands/hmi/ui_add_command_request.cc index ed9f7979a1..c0edad3f80 100644 --- a/src/components/application_manager/src/commands/hmi/ui_add_command_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_add_command_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -UIAddCommandRequest::UIAddCommandRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +UIAddCommandRequest::UIAddCommandRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIAddCommandRequest::~UIAddCommandRequest() { -} +UIAddCommandRequest::~UIAddCommandRequest() {} void UIAddCommandRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void UIAddCommandRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_add_command_response.cc b/src/components/application_manager/src/commands/hmi/ui_add_command_response.cc index 13b2ab1b2b..a7eaabc91e 100644 --- a/src/components/application_manager/src/commands/hmi/ui_add_command_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_add_command_response.cc @@ -37,19 +37,18 @@ namespace application_manager { namespace commands { -UIAddCommandResponse::UIAddCommandResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +UIAddCommandResponse::UIAddCommandResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIAddCommandResponse::~UIAddCommandResponse() { -} +UIAddCommandResponse::~UIAddCommandResponse() {} void UIAddCommandResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_AddCommand); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc b/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc index 667499584f..f0a233853c 100644 --- a/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_add_submenu_request.cc @@ -36,15 +36,14 @@ namespace application_manager { namespace commands { -UIAddSubmenuRequest::UIAddSubmenuRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +UIAddSubmenuRequest::UIAddSubmenuRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIAddSubmenuRequest::~UIAddSubmenuRequest() { -} +UIAddSubmenuRequest::~UIAddSubmenuRequest() {} void UIAddSubmenuRequest::Run() { - LOG4CXX_INFO(logger_, "UIAddCommandRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } @@ -52,4 +51,3 @@ void UIAddSubmenuRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_add_submenu_response.cc b/src/components/application_manager/src/commands/hmi/ui_add_submenu_response.cc index 54247dbbce..6c6c18cbad 100644 --- a/src/components/application_manager/src/commands/hmi/ui_add_submenu_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_add_submenu_response.cc @@ -31,25 +31,25 @@ */ #include "application_manager/commands/hmi/ui_add_submenu_response.h" #include "application_manager/event_engine/event.h" + #include "interfaces/HMI_API.h" namespace application_manager { namespace commands { -UIAddSubmenuResponse::UIAddSubmenuResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +UIAddSubmenuResponse::UIAddSubmenuResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIAddSubmenuResponse::~UIAddSubmenuResponse() { -} +UIAddSubmenuResponse::~UIAddSubmenuResponse() {} void UIAddSubmenuResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_AddSubMenu); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_alert_request.cc b/src/components/application_manager/src/commands/hmi/ui_alert_request.cc index c706d5fdba..44673d4981 100644 --- a/src/components/application_manager/src/commands/hmi/ui_alert_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_alert_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -UIAlertRequest::UIAlertRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +UIAlertRequest::UIAlertRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIAlertRequest::~UIAlertRequest() { -} +UIAlertRequest::~UIAlertRequest() {} void UIAlertRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void UIAlertRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_alert_response.cc b/src/components/application_manager/src/commands/hmi/ui_alert_response.cc index 8c9ddef7ac..6d552a1eb7 100644 --- a/src/components/application_manager/src/commands/hmi/ui_alert_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_alert_response.cc @@ -31,25 +31,25 @@ */ #include "application_manager/commands/hmi/ui_alert_response.h" #include "application_manager/event_engine/event.h" + #include "interfaces/HMI_API.h" namespace application_manager { namespace commands { -UIAlertResponse::UIAlertResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +UIAlertResponse::UIAlertResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIAlertResponse::~UIAlertResponse() { -} +UIAlertResponse::~UIAlertResponse() {} void UIAlertResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_Alert); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_change_registration_request.cc b/src/components/application_manager/src/commands/hmi/ui_change_registration_request.cc index 67c9be6cb5..dcc88125fc 100644 --- a/src/components/application_manager/src/commands/hmi/ui_change_registration_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_change_registration_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { UIChangeRegistrationRequest::UIChangeRegistrationRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIChangeRegistrationRequest::~UIChangeRegistrationRequest() { -} +UIChangeRegistrationRequest::~UIChangeRegistrationRequest() {} void UIChangeRegistrationRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void UIChangeRegistrationRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_change_registration_response.cc b/src/components/application_manager/src/commands/hmi/ui_change_registration_response.cc index 1d59d66d74..52805a93c8 100644 --- a/src/components/application_manager/src/commands/hmi/ui_change_registration_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_change_registration_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/ui_change_registration_response.h" #include "application_manager/event_engine/event.h" + #include "interfaces/HMI_API.h" namespace application_manager { @@ -38,19 +39,17 @@ namespace application_manager { namespace commands { UIChangeRegistratioResponse::UIChangeRegistratioResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIChangeRegistratioResponse::~UIChangeRegistratioResponse() { -} +UIChangeRegistratioResponse::~UIChangeRegistratioResponse() {} void UIChangeRegistratioResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_ChangeRegistration); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_delete_command_request.cc b/src/components/application_manager/src/commands/hmi/ui_delete_command_request.cc index 7d5532f30f..7bd529e8dc 100644 --- a/src/components/application_manager/src/commands/hmi/ui_delete_command_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_delete_command_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -UIDeleteCommandRequest::UIDeleteCommandRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +UIDeleteCommandRequest::UIDeleteCommandRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIDeleteCommandRequest::~UIDeleteCommandRequest() { -} +UIDeleteCommandRequest::~UIDeleteCommandRequest() {} void UIDeleteCommandRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void UIDeleteCommandRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_delete_command_response.cc b/src/components/application_manager/src/commands/hmi/ui_delete_command_response.cc index 2fb94a63a3..74a1bd64c2 100644 --- a/src/components/application_manager/src/commands/hmi/ui_delete_command_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_delete_command_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/ui_delete_command_response.h" #include "application_manager/event_engine/event.h" + #include "interfaces/HMI_API.h" namespace application_manager { @@ -38,19 +39,17 @@ namespace application_manager { namespace commands { UIDeleteCommandResponse::UIDeleteCommandResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIDeleteCommandResponse::~UIDeleteCommandResponse() { -} +UIDeleteCommandResponse::~UIDeleteCommandResponse() {} void UIDeleteCommandResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_DeleteCommand); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_delete_submenu_request.cc b/src/components/application_manager/src/commands/hmi/ui_delete_submenu_request.cc index e945139639..335d97eee4 100644 --- a/src/components/application_manager/src/commands/hmi/ui_delete_submenu_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_delete_submenu_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -UIDeleteSubmenuRequest::UIDeleteSubmenuRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +UIDeleteSubmenuRequest::UIDeleteSubmenuRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIDeleteSubmenuRequest::~UIDeleteSubmenuRequest() { -} +UIDeleteSubmenuRequest::~UIDeleteSubmenuRequest() {} void UIDeleteSubmenuRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void UIDeleteSubmenuRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_delete_submenu_response.cc b/src/components/application_manager/src/commands/hmi/ui_delete_submenu_response.cc index 89a5a19a0b..302343da5e 100644 --- a/src/components/application_manager/src/commands/hmi/ui_delete_submenu_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_delete_submenu_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/ui_delete_submenu_response.h" #include "application_manager/event_engine/event.h" + #include "interfaces/HMI_API.h" namespace application_manager { @@ -38,19 +39,17 @@ namespace application_manager { namespace commands { UIDeleteSubmenuResponse::UIDeleteSubmenuResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIDeleteSubmenuResponse::~UIDeleteSubmenuResponse() { -} +UIDeleteSubmenuResponse::~UIDeleteSubmenuResponse() {} void UIDeleteSubmenuResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_DeleteSubMenu); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_request.cc b/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_request.cc index b87e1d89b8..e1cd11f922 100644 --- a/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { UIEndAudioPassThruRequest::UIEndAudioPassThruRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIEndAudioPassThruRequest::~UIEndAudioPassThruRequest() { -} +UIEndAudioPassThruRequest::~UIEndAudioPassThruRequest() {} void UIEndAudioPassThruRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void UIEndAudioPassThruRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_response.cc b/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_response.cc index 8f5d92b78f..e9eb596b85 100644 --- a/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_end_audio_pass_thru_response.cc @@ -31,6 +31,7 @@ */ #include "application_manager/commands/hmi/ui_end_audio_pass_thru_response.h" #include "application_manager/event_engine/event.h" + #include "interfaces/HMI_API.h" namespace application_manager { @@ -38,19 +39,17 @@ namespace application_manager { namespace commands { UIEndAudioPassThruResponse::UIEndAudioPassThruResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIEndAudioPassThruResponse::~UIEndAudioPassThruResponse() { -} +UIEndAudioPassThruResponse::~UIEndAudioPassThruResponse() {} void UIEndAudioPassThruResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_EndAudioPassThru); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_request.cc b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_request.cc index 74ee67e884..0ae4258d6b 100644 --- a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { UIGetCapabilitiesRequest::UIGetCapabilitiesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIGetCapabilitiesRequest::~UIGetCapabilitiesRequest() { -} +UIGetCapabilitiesRequest::~UIGetCapabilitiesRequest() {} void UIGetCapabilitiesRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void UIGetCapabilitiesRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc index b62f24cc51..de0a2f2157 100644 --- a/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_get_capabilities_response.cc @@ -30,25 +30,21 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/ui_get_capabilities_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { UIGetCapabilitiesResponse::UIGetCapabilitiesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIGetCapabilitiesResponse::~UIGetCapabilitiesResponse() { -} +UIGetCapabilitiesResponse::~UIGetCapabilitiesResponse() {} void UIGetCapabilitiesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); const smart_objects::SmartObject& msg_params = (*message_)[strings::msg_params]; @@ -83,7 +79,6 @@ void UIGetCapabilitiesResponse::Run() { msg_params[strings::hmi_capabilities][strings::phone_call].asBool()); } } - } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_get_language_request.cc b/src/components/application_manager/src/commands/hmi/ui_get_language_request.cc index 1b22a9b58f..59d9eef6e3 100644 --- a/src/components/application_manager/src/commands/hmi/ui_get_language_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_get_language_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -UIGetLanguageRequest::UIGetLanguageRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +UIGetLanguageRequest::UIGetLanguageRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIGetLanguageRequest::~UIGetLanguageRequest() { -} +UIGetLanguageRequest::~UIGetLanguageRequest() {} void UIGetLanguageRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void UIGetLanguageRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_get_language_response.cc b/src/components/application_manager/src/commands/hmi/ui_get_language_response.cc index cba85d91e7..dfbdb89804 100644 --- a/src/components/application_manager/src/commands/hmi/ui_get_language_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_get_language_response.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,29 +30,41 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/ui_get_language_response.h" -#include "application_manager/application_manager_impl.h" + +#include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" namespace application_manager { namespace commands { -UIGetLanguageResponse::UIGetLanguageResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +UIGetLanguageResponse::UIGetLanguageResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIGetLanguageResponse::~UIGetLanguageResponse() { -} +UIGetLanguageResponse::~UIGetLanguageResponse() {} void UIGetLanguageResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); + using namespace hmi_apis; + + Common_Language::eType language = Common_Language::INVALID_ENUM; + + if ((*message_).keyExists(strings::msg_params) && + (*message_)[strings::msg_params].keyExists(hmi_response::language)) { + language = static_cast<Common_Language::eType>( + (*message_)[strings::msg_params][hmi_response::language].asInt()); + } - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + application_manager_.hmi_capabilities().set_active_ui_language(language); - hmi_capabilities.set_active_ui_language( - static_cast<hmi_apis::Common_Language::eType>( - (*message_)[strings::msg_params][hmi_response::language].asInt())); + LOG4CXX_DEBUG(logger_, + "Raising event for function_id " << function_id() + << " and correlation_id " + << correlation_id()); + event_engine::Event event(FunctionID::UI_GetLanguage); + event.set_smart_object(*message_); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_request.cc b/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_request.cc index 5cd0c09e65..598ff39f79 100644 --- a/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { UIGetSupportedLanguagesRequest::UIGetSupportedLanguagesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIGetSupportedLanguagesRequest::~UIGetSupportedLanguagesRequest() { -} +UIGetSupportedLanguagesRequest::~UIGetSupportedLanguagesRequest() {} void UIGetSupportedLanguagesRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void UIGetSupportedLanguagesRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_response.cc b/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_response.cc index 2057f3cbb2..e5849f5f63 100644 --- a/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/ui_get_supported_languages_response.h" -#include "application_manager/application_manager_impl.h" + #include "interfaces/HMI_API.h" namespace application_manager { @@ -38,12 +38,10 @@ namespace application_manager { namespace commands { UIGetSupportedLanguagesResponse::UIGetSupportedLanguagesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIGetSupportedLanguagesResponse::~UIGetSupportedLanguagesResponse() { -} +UIGetSupportedLanguagesResponse::~UIGetSupportedLanguagesResponse() {} void UIGetSupportedLanguagesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,8 +51,7 @@ void UIGetSupportedLanguagesResponse::Run() { (*message_)[strings::params][hmi_response::code].asInt()); if (hmi_apis::Common_Result::SUCCESS == code) { - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_ui_supported_languages( (*message_)[strings::msg_params][hmi_response::languages]); 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 94df3cec7d..463ae9d41d 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 @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -UIIsReadyRequest::UIIsReadyRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +UIIsReadyRequest::UIIsReadyRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIIsReadyRequest::~UIIsReadyRequest() { -} +UIIsReadyRequest::~UIIsReadyRequest() {} void UIIsReadyRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void UIIsReadyRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/ui_is_ready_response.cc index 9edf77080e..e7fca943bc 100644 --- a/src/components/application_manager/src/commands/hmi/ui_is_ready_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_is_ready_response.cc @@ -30,18 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/ui_is_ready_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { -UIIsReadyResponse::UIIsReadyResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +UIIsReadyResponse::UIIsReadyResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIIsReadyResponse::~UIIsReadyResponse() { -} +UIIsReadyResponse::~UIIsReadyResponse() {} void UIIsReadyResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,8 +50,7 @@ void UIIsReadyResponse::Run() { is_available = object[strings::msg_params][strings::available].asBool(); } - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_is_ui_cooperating(is_available); } diff --git a/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_request.cc b/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_request.cc index 3cf7722b24..a88719d303 100644 --- a/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { UIPerformAudioPassThruRequest::UIPerformAudioPassThruRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIPerformAudioPassThruRequest::~UIPerformAudioPassThruRequest() { -} +UIPerformAudioPassThruRequest::~UIPerformAudioPassThruRequest() {} void UIPerformAudioPassThruRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void UIPerformAudioPassThruRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_response.cc b/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_response.cc index c8a488e44d..0736cca526 100644 --- a/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_perform_audio_pass_thru_response.cc @@ -38,19 +38,17 @@ namespace application_manager { namespace commands { UIPerformAudioPassThruResponse::UIPerformAudioPassThruResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIPerformAudioPassThruResponse::~UIPerformAudioPassThruResponse() { -} +UIPerformAudioPassThruResponse::~UIPerformAudioPassThruResponse() {} void UIPerformAudioPassThruResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_PerformAudioPassThru); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_perform_interaction_request.cc b/src/components/application_manager/src/commands/hmi/ui_perform_interaction_request.cc index 2b1f5ce484..82a900f1ae 100644 --- a/src/components/application_manager/src/commands/hmi/ui_perform_interaction_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_perform_interaction_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { UIPerformInteractionRequest::UIPerformInteractionRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIPerformInteractionRequest::~UIPerformInteractionRequest() { -} +UIPerformInteractionRequest::~UIPerformInteractionRequest() {} void UIPerformInteractionRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void UIPerformInteractionRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_perform_interaction_response.cc b/src/components/application_manager/src/commands/hmi/ui_perform_interaction_response.cc index 25237525da..ea78c0cd66 100644 --- a/src/components/application_manager/src/commands/hmi/ui_perform_interaction_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_perform_interaction_response.cc @@ -38,18 +38,16 @@ namespace application_manager { namespace commands { UIPerformInteractionResponse::UIPerformInteractionResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIPerformInteractionResponse::~UIPerformInteractionResponse() { -} +UIPerformInteractionResponse::~UIPerformInteractionResponse() {} void UIPerformInteractionResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_PerformInteraction); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_scrollable_message_request.cc b/src/components/application_manager/src/commands/hmi/ui_scrollable_message_request.cc index 911c840ce4..006944d404 100644 --- a/src/components/application_manager/src/commands/hmi/ui_scrollable_message_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_scrollable_message_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { UIScrollableMessageRequest::UIScrollableMessageRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIScrollableMessageRequest::~UIScrollableMessageRequest() { -} +UIScrollableMessageRequest::~UIScrollableMessageRequest() {} void UIScrollableMessageRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void UIScrollableMessageRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_scrollable_message_response.cc b/src/components/application_manager/src/commands/hmi/ui_scrollable_message_response.cc index 58c793c3b6..c39a99fc61 100644 --- a/src/components/application_manager/src/commands/hmi/ui_scrollable_message_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_scrollable_message_response.cc @@ -38,19 +38,17 @@ namespace application_manager { namespace commands { UIScrollableMessageResponse::UIScrollableMessageResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIScrollableMessageResponse::~UIScrollableMessageResponse() { -} +UIScrollableMessageResponse::~UIScrollableMessageResponse() {} void UIScrollableMessageResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_ScrollableMessage); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_set_app_icon_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_app_icon_request.cc index c4a3b3b3af..2666eedfc8 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_app_icon_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_app_icon_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -UISetAppIconRequest::UISetAppIconRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +UISetAppIconRequest::UISetAppIconRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UISetAppIconRequest::~UISetAppIconRequest() { -} +UISetAppIconRequest::~UISetAppIconRequest() {} void UISetAppIconRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void UISetAppIconRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_set_app_icon_response.cc b/src/components/application_manager/src/commands/hmi/ui_set_app_icon_response.cc index 46c10e8f22..18fc5a5761 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_app_icon_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_app_icon_response.cc @@ -37,19 +37,18 @@ namespace application_manager { namespace commands { -UISetAppIconResponse::UISetAppIconResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +UISetAppIconResponse::UISetAppIconResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UISetAppIconResponse::~UISetAppIconResponse() { -} +UISetAppIconResponse::~UISetAppIconResponse() {} void UISetAppIconResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_SetAppIcon); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_set_display_layout_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_display_layout_request.cc index df9f6cf2a6..cd69c9c8e6 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_display_layout_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_display_layout_request.cc @@ -37,11 +37,10 @@ namespace application_manager { namespace commands { UiSetDisplayLayoutRequest::UiSetDisplayLayoutRequest( - const MessageSharedPtr& message): RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UiSetDisplayLayoutRequest::~UiSetDisplayLayoutRequest() { -} +UiSetDisplayLayoutRequest::~UiSetDisplayLayoutRequest() {} void UiSetDisplayLayoutRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -51,4 +50,3 @@ void UiSetDisplayLayoutRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_set_display_layout_response.cc b/src/components/application_manager/src/commands/hmi/ui_set_display_layout_response.cc index f23cc92642..c5a439636f 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_display_layout_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_display_layout_response.cc @@ -39,18 +39,17 @@ namespace application_manager { namespace commands { UiSetDisplayLayoutResponse::UiSetDisplayLayoutResponse( - const MessageSharedPtr& message): ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UiSetDisplayLayoutResponse::~UiSetDisplayLayoutResponse() { -} +UiSetDisplayLayoutResponse::~UiSetDisplayLayoutResponse() {} void UiSetDisplayLayoutResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_SetDisplayLayout); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_set_global_properties_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_global_properties_request.cc index 39a0e865df..8658a043b0 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_global_properties_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_global_properties_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { UISetGlobalPropertiesRequest::UISetGlobalPropertiesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UISetGlobalPropertiesRequest::~UISetGlobalPropertiesRequest() { -} +UISetGlobalPropertiesRequest::~UISetGlobalPropertiesRequest() {} void UISetGlobalPropertiesRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void UISetGlobalPropertiesRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_set_global_properties_response.cc b/src/components/application_manager/src/commands/hmi/ui_set_global_properties_response.cc index 23173961fb..d10c206a7c 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_global_properties_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_global_properties_response.cc @@ -38,19 +38,17 @@ namespace application_manager { namespace commands { UISetGlobalPropertiesResponse::UISetGlobalPropertiesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UISetGlobalPropertiesResponse::~UISetGlobalPropertiesResponse() { -} +UISetGlobalPropertiesResponse::~UISetGlobalPropertiesResponse() {} void UISetGlobalPropertiesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_SetGlobalProperties); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_set_icon_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_icon_request.cc index b587a3028e..c98b7ec028 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_icon_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_icon_request.cc @@ -37,14 +37,12 @@ namespace application_manager { namespace commands { UISetIconRequest::UISetIconRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} + : RequestToHMI(message) {} -UISetIconRequest::~UISetIconRequest() { -} +UISetIconRequest::~UISetIconRequest() {} void UISetIconRequest::Run() { - LOG4CXX_INFO(logger_, "UISetIconRequest::Run"); + LOG4CXX_AUTO_TRACE(logger_); SendRequest(); } @@ -52,4 +50,3 @@ void UISetIconRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_request.cc index 272ff561aa..955cb1d57b 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { UISetMediaClockTimerRequest::UISetMediaClockTimerRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UISetMediaClockTimerRequest::~UISetMediaClockTimerRequest() { -} +UISetMediaClockTimerRequest::~UISetMediaClockTimerRequest() {} void UISetMediaClockTimerRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void UISetMediaClockTimerRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_response.cc b/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_response.cc index ae878bd694..32acef4994 100644 --- a/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_response.cc @@ -38,19 +38,17 @@ namespace application_manager { namespace commands { UISetMediaClockTimerResponse::UISetMediaClockTimerResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UISetMediaClockTimerResponse::~UISetMediaClockTimerResponse() { -} +UISetMediaClockTimerResponse::~UISetMediaClockTimerResponse() {} void UISetMediaClockTimerResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_SetMediaClockTimer); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_show_request.cc b/src/components/application_manager/src/commands/hmi/ui_show_request.cc index 65b9894902..9c0e90feff 100644 --- a/src/components/application_manager/src/commands/hmi/ui_show_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_show_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -UIShowRequest::UIShowRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +UIShowRequest::UIShowRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UIShowRequest::~UIShowRequest() { -} +UIShowRequest::~UIShowRequest() {} void UIShowRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void UIShowRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_show_response.cc b/src/components/application_manager/src/commands/hmi/ui_show_response.cc index 8d348e6086..333d9e96c5 100644 --- a/src/components/application_manager/src/commands/hmi/ui_show_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_show_response.cc @@ -36,19 +36,18 @@ namespace application_manager { namespace commands { -UIShowResponse::UIShowResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +UIShowResponse::UIShowResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UIShowResponse::~UIShowResponse() { -} +UIShowResponse::~UIShowResponse() {} void UIShowResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_Show); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/ui_slider_request.cc b/src/components/application_manager/src/commands/hmi/ui_slider_request.cc index c8d3242d98..26e6ed76b0 100644 --- a/src/components/application_manager/src/commands/hmi/ui_slider_request.cc +++ b/src/components/application_manager/src/commands/hmi/ui_slider_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -UISliderRequest::UISliderRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +UISliderRequest::UISliderRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UISliderRequest::~UISliderRequest() { -} +UISliderRequest::~UISliderRequest() {} void UISliderRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void UISliderRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/ui_slider_response.cc b/src/components/application_manager/src/commands/hmi/ui_slider_response.cc index 7837117ebd..091eb50e0d 100644 --- a/src/components/application_manager/src/commands/hmi/ui_slider_response.cc +++ b/src/components/application_manager/src/commands/hmi/ui_slider_response.cc @@ -37,19 +37,18 @@ namespace application_manager { namespace commands { -UISliderResponse::UISliderResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +UISliderResponse::UISliderResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UISliderResponse::~UISliderResponse() { -} +UISliderResponse::~UISliderResponse() {} void UISliderResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::UI_Slider); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/update_app_list_request.cc b/src/components/application_manager/src/commands/hmi/update_app_list_request.cc index 72f65d1a2e..286d269727 100644 --- a/src/components/application_manager/src/commands/hmi/update_app_list_request.cc +++ b/src/components/application_manager/src/commands/hmi/update_app_list_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -UpdateAppListRequest::UpdateAppListRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +UpdateAppListRequest::UpdateAppListRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UpdateAppListRequest::~UpdateAppListRequest() { -} +UpdateAppListRequest::~UpdateAppListRequest() {} void UpdateAppListRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,5 +51,3 @@ void UpdateAppListRequest::Run() { } // namespace commands } // namespace application_manager - - diff --git a/src/components/application_manager/src/commands/hmi/update_app_list_response.cc b/src/components/application_manager/src/commands/hmi/update_app_list_response.cc index 308bce3ad2..6546d03805 100644 --- a/src/components/application_manager/src/commands/hmi/update_app_list_response.cc +++ b/src/components/application_manager/src/commands/hmi/update_app_list_response.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -UpdateAppListResponse::UpdateAppListResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +UpdateAppListResponse::UpdateAppListResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UpdateAppListResponse::~UpdateAppListResponse() { -} +UpdateAppListResponse::~UpdateAppListResponse() {} void UpdateAppListResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,5 +51,3 @@ void UpdateAppListResponse::Run() { } // namespace commands } // namespace application_manager - - diff --git a/src/components/application_manager/src/commands/hmi/update_device_list_request.cc b/src/components/application_manager/src/commands/hmi/update_device_list_request.cc index 696e2f85c4..74d104b36d 100644 --- a/src/components/application_manager/src/commands/hmi/update_device_list_request.cc +++ b/src/components/application_manager/src/commands/hmi/update_device_list_request.cc @@ -31,8 +31,7 @@ */ #include "application_manager/commands/hmi/update_device_list_request.h" -#include "application_manager/application_manager_impl.h" -#include "config_profile/profile.h" + #include "interfaces/HMI_API.h" #include <unistd.h> @@ -42,21 +41,21 @@ namespace application_manager { namespace commands { UpdateDeviceListRequest::UpdateDeviceListRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) + , EventObserver(application_manager_.event_dispatcher()) {} -UpdateDeviceListRequest::~UpdateDeviceListRequest() { -} +UpdateDeviceListRequest::~UpdateDeviceListRequest() {} void UpdateDeviceListRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); sync_primitives::AutoLock auto_lock(wait_hmi_lock); // Fix problem with SDL and HMI HTML. This problem is not actual for HMI PASA. - // Flag conditional compilation for specific customer is used in order to exclude + // Flag conditional compilation for specific customer is used in order to + // exclude // hit code to RTC - if (true == profile::Profile::instance()->launch_hmi()) { - if (!ApplicationManagerImpl::instance()->IsHMICooperating()) { + if (true == application_manager_.get_settings().launch_hmi()) { + if (!application_manager_.IsHMICooperating()) { LOG4CXX_INFO(logger_, "Wait for HMI Cooperation"); subscribe_on_event(hmi_apis::FunctionID::BasicCommunication_OnReady); termination_condition_.Wait(auto_lock); @@ -71,13 +70,13 @@ void UpdateDeviceListRequest::on_event(const event_engine::Event& event) { LOG4CXX_AUTO_TRACE(logger_); sync_primitives::AutoLock auto_lock(wait_hmi_lock); switch (event.id()) { - case hmi_apis::FunctionID::BasicCommunication_OnReady : { + case hmi_apis::FunctionID::BasicCommunication_OnReady: { LOG4CXX_INFO(logger_, "received OnReady"); unsubscribe_from_event(hmi_apis::FunctionID::BasicCommunication_OnReady); termination_condition_.Broadcast(); break; }; - default : { + default: { LOG4CXX_ERROR(logger_, "Unknown event "); break; }; @@ -93,4 +92,3 @@ bool UpdateDeviceListRequest::CleanUp() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/update_device_list_response.cc b/src/components/application_manager/src/commands/hmi/update_device_list_response.cc index b3e0f9a309..6d9dec92f8 100644 --- a/src/components/application_manager/src/commands/hmi/update_device_list_response.cc +++ b/src/components/application_manager/src/commands/hmi/update_device_list_response.cc @@ -36,12 +36,10 @@ namespace application_manager { namespace commands { UpdateDeviceListResponse::UpdateDeviceListResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UpdateDeviceListResponse::~UpdateDeviceListResponse() { -} +UpdateDeviceListResponse::~UpdateDeviceListResponse() {} void UpdateDeviceListResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); diff --git a/src/components/application_manager/src/commands/hmi/update_sdl_request.cc b/src/components/application_manager/src/commands/hmi/update_sdl_request.cc index b03e595e9c..44f7547964 100644 --- a/src/components/application_manager/src/commands/hmi/update_sdl_request.cc +++ b/src/components/application_manager/src/commands/hmi/update_sdl_request.cc @@ -32,27 +32,24 @@ */ #include "application_manager/commands/hmi/update_sdl_request.h" -#include "application_manager/policies/policy_handler.h" namespace application_manager { namespace commands { -UpdateSDLRequest::UpdateSDLRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +UpdateSDLRequest::UpdateSDLRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -UpdateSDLRequest::~UpdateSDLRequest() { -} +UpdateSDLRequest::~UpdateSDLRequest() {} void UpdateSDLRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - policy::PolicyHandler::instance()->PTExchangeAtUserRequest( + application_manager_.GetPolicyHandler().PTExchangeAtUserRequest( (*message_)[strings::params][strings::correlation_id].asInt()); } } // namespace commands } // namespace application_manager - 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 d9c8b6102f..0e8978fe89 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,25 +30,23 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/update_sdl_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { -UpdateSDLResponse::UpdateSDLResponse( - const MessageSharedPtr& message): ResponseFromHMI(message) { -} +UpdateSDLResponse::UpdateSDLResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -UpdateSDLResponse::~UpdateSDLResponse() { -} +UpdateSDLResponse::~UpdateSDLResponse() {} void UpdateSDLResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_; (*message_)[strings::params][strings::protocol_version] = protocol_version_; - ApplicationManagerImpl::instance()->SendMessageToHMI(message_); + application_manager_.SendMessageToHMI(message_); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_request.cc b/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_request.cc index eb9a9841be..5fe81fcbd8 100644 --- a/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -VIDiagnosticMessageRequest::VIDiagnosticMessageRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +VIDiagnosticMessageRequest::VIDiagnosticMessageRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VIDiagnosticMessageRequest::~VIDiagnosticMessageRequest() { -} +VIDiagnosticMessageRequest::~VIDiagnosticMessageRequest() {} void VIDiagnosticMessageRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void VIDiagnosticMessageRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_response.cc b/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_response.cc index 4183395e99..e19af75b54 100644 --- a/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_diagnostic_message_response.cc @@ -37,19 +37,19 @@ namespace application_manager { namespace commands { -VIDiagnosticMessageResponse::VIDiagnosticMessageResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +VIDiagnosticMessageResponse::VIDiagnosticMessageResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VIDiagnosticMessageResponse::~VIDiagnosticMessageResponse() { -} +VIDiagnosticMessageResponse::~VIDiagnosticMessageResponse() {} void VIDiagnosticMessageResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - event_engine::Event event(hmi_apis::FunctionID::VehicleInfo_DiagnosticMessage); + event_engine::Event event( + hmi_apis::FunctionID::VehicleInfo_DiagnosticMessage); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vi_get_dtcs_request.cc b/src/components/application_manager/src/commands/hmi/vi_get_dtcs_request.cc index a89252ada2..b373471c43 100644 --- a/src/components/application_manager/src/commands/hmi/vi_get_dtcs_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_get_dtcs_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -VIGetDTCsRequest::VIGetDTCsRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +VIGetDTCsRequest::VIGetDTCsRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VIGetDTCsRequest::~VIGetDTCsRequest() { -} +VIGetDTCsRequest::~VIGetDTCsRequest() {} void VIGetDTCsRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void VIGetDTCsRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vi_get_dtcs_response.cc b/src/components/application_manager/src/commands/hmi/vi_get_dtcs_response.cc index c44f5213d2..3e720f9dbc 100644 --- a/src/components/application_manager/src/commands/hmi/vi_get_dtcs_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_get_dtcs_response.cc @@ -37,19 +37,18 @@ namespace application_manager { namespace commands { -VIGetDTCsResponse::VIGetDTCsResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +VIGetDTCsResponse::VIGetDTCsResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VIGetDTCsResponse::~VIGetDTCsResponse() { -} +VIGetDTCsResponse::~VIGetDTCsResponse() {} void VIGetDTCsResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VehicleInfo_GetDTCs); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_request.cc b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_request.cc index 37d5ede4b0..05424c4967 100644 --- a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { VIGetVehicleDataRequest::VIGetVehicleDataRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VIGetVehicleDataRequest::~VIGetVehicleDataRequest() { -} +VIGetVehicleDataRequest::~VIGetVehicleDataRequest() {} void VIGetVehicleDataRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void VIGetVehicleDataRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_response.cc b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_response.cc index 0ed0f7f515..2794f6eddd 100644 --- a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_data_response.cc @@ -31,27 +31,24 @@ */ #include "application_manager/commands/hmi/vi_get_vehicle_data_response.h" #include "application_manager/event_engine/event.h" -#include "application_manager/policies/policy_handler.h" #include "interfaces/HMI_API.h" namespace application_manager { namespace commands { VIGetVehicleDataResponse::VIGetVehicleDataResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VIGetVehicleDataResponse::~VIGetVehicleDataResponse() { -} +VIGetVehicleDataResponse::~VIGetVehicleDataResponse() {} void VIGetVehicleDataResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VehicleInfo_GetVehicleData); - if ((*message_)[strings::params][strings::message_type] - == static_cast<int32_t>(hmi_apis::messageType::error_response)) { + if ((*message_)[strings::params][strings::message_type] == + static_cast<int32_t>(hmi_apis::messageType::error_response)) { smart_objects::SmartObject result(smart_objects::SmartType_Map); if ((*message_)[strings::params].keyExists(strings::data)) { @@ -73,10 +70,10 @@ void VIGetVehicleDataResponse::Run() { event.set_smart_object(result); } else { event.set_smart_object(*message_); - policy::PolicyHandler::instance()->OnVehicleDataUpdated(*message_); + application_manager_.GetPolicyHandler().OnVehicleDataUpdated(*message_); } - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_request.cc b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_request.cc index 11dd26dfad..64a3831e1c 100644 --- a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { VIGetVehicleTypeRequest::VIGetVehicleTypeRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VIGetVehicleTypeRequest::~VIGetVehicleTypeRequest() { -} +VIGetVehicleTypeRequest::~VIGetVehicleTypeRequest() {} void VIGetVehicleTypeRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void VIGetVehicleTypeRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_response.cc b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_response.cc index 2b5f6b96be..2369eb7eee 100644 --- a/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_get_vehicle_type_response.cc @@ -30,25 +30,21 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/vi_get_vehicle_type_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { VIGetVehicleTypeResponse::VIGetVehicleTypeResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VIGetVehicleTypeResponse::~VIGetVehicleTypeResponse() { -} +VIGetVehicleTypeResponse::~VIGetVehicleTypeResponse() {} void VIGetVehicleTypeResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_vehicle_type( (*message_)[strings::msg_params][hmi_response::vehicle_type]); 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 aae05e0fcc..3ecc2ffe90 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 @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -VIIsReadyRequest::VIIsReadyRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +VIIsReadyRequest::VIIsReadyRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VIIsReadyRequest::~VIIsReadyRequest() { -} +VIIsReadyRequest::~VIIsReadyRequest() {} void VIIsReadyRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void VIIsReadyRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vi_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/vi_is_ready_response.cc index 4a79a6d9b9..91dae226b6 100644 --- a/src/components/application_manager/src/commands/hmi/vi_is_ready_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_is_ready_response.cc @@ -30,19 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/vi_is_ready_response.h" -#include "application_manager/application_manager_impl.h" -#include "application_manager/policies/policy_handler.h" namespace application_manager { namespace commands { -VIIsReadyResponse::VIIsReadyResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +VIIsReadyResponse::VIIsReadyResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VIIsReadyResponse::~VIIsReadyResponse() { -} +VIIsReadyResponse::~VIIsReadyResponse() {} void VIIsReadyResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,11 +50,10 @@ void VIIsReadyResponse::Run() { is_available = object[strings::msg_params][strings::available].asBool(); } - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_is_ivi_cooperating(is_available); - policy::PolicyHandler::instance()->OnVIIsReady(); + application_manager_.GetPolicyHandler().OnVIIsReady(); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vi_read_did_request.cc b/src/components/application_manager/src/commands/hmi/vi_read_did_request.cc index 92a105dde4..d72fcb8157 100644 --- a/src/components/application_manager/src/commands/hmi/vi_read_did_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_read_did_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -VIReadDIDRequest::VIReadDIDRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +VIReadDIDRequest::VIReadDIDRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VIReadDIDRequest::~VIReadDIDRequest() { -} +VIReadDIDRequest::~VIReadDIDRequest() {} void VIReadDIDRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void VIReadDIDRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vi_read_did_response.cc b/src/components/application_manager/src/commands/hmi/vi_read_did_response.cc index 675b944272..568a573f88 100644 --- a/src/components/application_manager/src/commands/hmi/vi_read_did_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_read_did_response.cc @@ -31,26 +31,23 @@ */ #include "application_manager/commands/hmi/vi_read_did_response.h" #include "application_manager/event_engine/event.h" -#include "application_manager/application_manager_impl.h" - namespace application_manager { namespace commands { -VIReadDIDResponse::VIReadDIDResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +VIReadDIDResponse::VIReadDIDResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VIReadDIDResponse::~VIReadDIDResponse() { -} +VIReadDIDResponse::~VIReadDIDResponse() {} void VIReadDIDResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VehicleInfo_ReadDID); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_request.cc b/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_request.cc index 5ad4daea94..5c953334bb 100644 --- a/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { VISubscribeVehicleDataRequest::VISubscribeVehicleDataRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VISubscribeVehicleDataRequest::~VISubscribeVehicleDataRequest() { -} +VISubscribeVehicleDataRequest::~VISubscribeVehicleDataRequest() {} void VISubscribeVehicleDataRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void VISubscribeVehicleDataRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_response.cc b/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_response.cc index 91d9c85382..4df2d9190a 100644 --- a/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_subscribe_vehicle_data_response.cc @@ -37,20 +37,17 @@ namespace application_manager { namespace commands { VISubscribeVehicleDataResponse::VISubscribeVehicleDataResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VISubscribeVehicleDataResponse::~VISubscribeVehicleDataResponse() { -} +VISubscribeVehicleDataResponse::~VISubscribeVehicleDataResponse() {} void VISubscribeVehicleDataResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event( - hmi_apis::FunctionID::VehicleInfo_SubscribeVehicleData - ); + hmi_apis::FunctionID::VehicleInfo_SubscribeVehicleData); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc b/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc index 7c12cbe6f1..2211cde19c 100644 --- a/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc +++ b/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { VIUnsubscribeVehicleDataRequest::VIUnsubscribeVehicleDataRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VIUnsubscribeVehicleDataRequest::~VIUnsubscribeVehicleDataRequest() { -} +VIUnsubscribeVehicleDataRequest::~VIUnsubscribeVehicleDataRequest() {} void VIUnsubscribeVehicleDataRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void VIUnsubscribeVehicleDataRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc b/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc index 124b7dacbd..5044f0ef43 100644 --- a/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc +++ b/src/components/application_manager/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc @@ -37,20 +37,17 @@ namespace application_manager { namespace commands { VIUnsubscribeVehicleDataResponse::VIUnsubscribeVehicleDataResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VIUnsubscribeVehicleDataResponse::~VIUnsubscribeVehicleDataResponse() { -} +VIUnsubscribeVehicleDataResponse::~VIUnsubscribeVehicleDataResponse() {} void VIUnsubscribeVehicleDataResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event( - hmi_apis::FunctionID::VehicleInfo_UnsubscribeVehicleData - ); + hmi_apis::FunctionID::VehicleInfo_UnsubscribeVehicleData); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vr_add_command_request.cc b/src/components/application_manager/src/commands/hmi/vr_add_command_request.cc index c900df1678..04af05d4e7 100644 --- a/src/components/application_manager/src/commands/hmi/vr_add_command_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_add_command_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -VRAddCommandRequest::VRAddCommandRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +VRAddCommandRequest::VRAddCommandRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VRAddCommandRequest::~VRAddCommandRequest() { -} +VRAddCommandRequest::~VRAddCommandRequest() {} void VRAddCommandRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void VRAddCommandRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vr_add_command_response.cc b/src/components/application_manager/src/commands/hmi/vr_add_command_response.cc index 3d34b5c65a..496bd47605 100644 --- a/src/components/application_manager/src/commands/hmi/vr_add_command_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_add_command_response.cc @@ -31,25 +31,25 @@ */ #include "application_manager/commands/hmi/vr_add_command_response.h" #include "application_manager/event_engine/event.h" + #include "interfaces/HMI_API.h" namespace application_manager { namespace commands { -VRAddCommandResponse::VRAddCommandResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +VRAddCommandResponse::VRAddCommandResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VRAddCommandResponse::~VRAddCommandResponse() { -} +VRAddCommandResponse::~VRAddCommandResponse() {} void VRAddCommandResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VR_AddCommand); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vr_change_registration_request.cc b/src/components/application_manager/src/commands/hmi/vr_change_registration_request.cc index fe8ee69021..e64e7cc388 100644 --- a/src/components/application_manager/src/commands/hmi/vr_change_registration_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_change_registration_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { VRChangeRegistrationRequest::VRChangeRegistrationRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VRChangeRegistrationRequest::~VRChangeRegistrationRequest() { -} +VRChangeRegistrationRequest::~VRChangeRegistrationRequest() {} void VRChangeRegistrationRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void VRChangeRegistrationRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc b/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc index 5bd2fb853a..8084688c15 100644 --- a/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_change_registration_response.cc @@ -38,19 +38,17 @@ namespace application_manager { namespace commands { VRChangeRegistrationResponse::VRChangeRegistrationResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VRChangeRegistrationResponse::~VRChangeRegistrationResponse() { -} +VRChangeRegistrationResponse::~VRChangeRegistrationResponse() {} void VRChangeRegistrationResponse::Run() { - LOG4CXX_INFO(logger_, "VRChangeRegistratioResponse::Run"); + LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VR_ChangeRegistration); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vr_delete_command_request.cc b/src/components/application_manager/src/commands/hmi/vr_delete_command_request.cc index e3052ae208..1db85529da 100644 --- a/src/components/application_manager/src/commands/hmi/vr_delete_command_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_delete_command_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -VRDeleteCommandRequest::VRDeleteCommandRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +VRDeleteCommandRequest::VRDeleteCommandRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VRDeleteCommandRequest::~VRDeleteCommandRequest() { -} +VRDeleteCommandRequest::~VRDeleteCommandRequest() {} void VRDeleteCommandRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void VRDeleteCommandRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vr_delete_command_response.cc b/src/components/application_manager/src/commands/hmi/vr_delete_command_response.cc index 8954b1d1b9..08711be2c8 100644 --- a/src/components/application_manager/src/commands/hmi/vr_delete_command_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_delete_command_response.cc @@ -38,19 +38,17 @@ namespace application_manager { namespace commands { VRDeleteCommandResponse::VRDeleteCommandResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VRDeleteCommandResponse::~VRDeleteCommandResponse() { -} +VRDeleteCommandResponse::~VRDeleteCommandResponse() {} void VRDeleteCommandResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VR_DeleteCommand); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vr_get_capabilities_request.cc b/src/components/application_manager/src/commands/hmi/vr_get_capabilities_request.cc index 58d0a4b3e4..3159380c17 100644 --- a/src/components/application_manager/src/commands/hmi/vr_get_capabilities_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_get_capabilities_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { VRGetCapabilitiesRequest::VRGetCapabilitiesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VRGetCapabilitiesRequest::~VRGetCapabilitiesRequest() { -} +VRGetCapabilitiesRequest::~VRGetCapabilitiesRequest() {} void VRGetCapabilitiesRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void VRGetCapabilitiesRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vr_get_capabilities_response.cc b/src/components/application_manager/src/commands/hmi/vr_get_capabilities_response.cc index 5ca1d86190..9aa0fc6668 100644 --- a/src/components/application_manager/src/commands/hmi/vr_get_capabilities_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_get_capabilities_response.cc @@ -30,28 +30,24 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/vr_get_capabilities_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { VRGetCapabilitiesResponse::VRGetCapabilitiesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VRGetCapabilitiesResponse::~VRGetCapabilitiesResponse() { -} +VRGetCapabilitiesResponse::~VRGetCapabilitiesResponse() {} void VRGetCapabilitiesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_vr_capabilities( - (*message_)[strings::msg_params][strings::vr_capabilities]); + (*message_)[strings::msg_params][strings::vr_capabilities]); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vr_get_language_request.cc b/src/components/application_manager/src/commands/hmi/vr_get_language_request.cc index 0b98979418..baf34c8017 100644 --- a/src/components/application_manager/src/commands/hmi/vr_get_language_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_get_language_request.cc @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -VRGetLanguageRequest::VRGetLanguageRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +VRGetLanguageRequest::VRGetLanguageRequest( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VRGetLanguageRequest::~VRGetLanguageRequest() { -} +VRGetLanguageRequest::~VRGetLanguageRequest() {} void VRGetLanguageRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void VRGetLanguageRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vr_get_language_response.cc b/src/components/application_manager/src/commands/hmi/vr_get_language_response.cc index 62127bdf9b..a55dca44a3 100644 --- a/src/components/application_manager/src/commands/hmi/vr_get_language_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_get_language_response.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Ford Motor Company + * Copyright (c) 2016, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,28 +30,41 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/vr_get_language_response.h" -#include "application_manager/application_manager_impl.h" + +#include "application_manager/event_engine/event.h" #include "interfaces/HMI_API.h" namespace application_manager { namespace commands { -VRGetLanguageResponse::VRGetLanguageResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +VRGetLanguageResponse::VRGetLanguageResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VRGetLanguageResponse::~VRGetLanguageResponse() { -} +VRGetLanguageResponse::~VRGetLanguageResponse() {} void VRGetLanguageResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); + using namespace hmi_apis; + + Common_Language::eType language = Common_Language::INVALID_ENUM; + + if ((*message_).keyExists(strings::msg_params) && + (*message_)[strings::msg_params].keyExists(hmi_response::language)) { + language = static_cast<Common_Language::eType>( + (*message_)[strings::msg_params][hmi_response::language].asInt()); + } + + application_manager_.hmi_capabilities().set_active_vr_language(language); - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); - hmi_capabilities.set_active_vr_language( - static_cast<hmi_apis::Common_Language::eType>( - (*message_)[strings::msg_params][hmi_response::language].asInt())); + LOG4CXX_DEBUG(logger_, + "Raising event for function_id " << function_id() + << " and correlation_id " + << correlation_id()); + event_engine::Event event(FunctionID::VR_GetLanguage); + event.set_smart_object(*message_); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands diff --git a/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_request.cc b/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_request.cc index aea97da02d..def4a64699 100644 --- a/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { VRGetSupportedLanguagesRequest::VRGetSupportedLanguagesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VRGetSupportedLanguagesRequest::~VRGetSupportedLanguagesRequest() { -} +VRGetSupportedLanguagesRequest::~VRGetSupportedLanguagesRequest() {} void VRGetSupportedLanguagesRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void VRGetSupportedLanguagesRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_response.cc b/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_response.cc index b1ea89a460..e5a6ed0b86 100644 --- a/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_response.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/vr_get_supported_languages_response.h" -#include "application_manager/application_manager_impl.h" + #include "interfaces/MOBILE_API.h" #include "interfaces/HMI_API.h" @@ -39,12 +39,10 @@ namespace application_manager { namespace commands { VRGetSupportedLanguagesResponse::VRGetSupportedLanguagesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VRGetSupportedLanguagesResponse::~VRGetSupportedLanguagesResponse() { -} +VRGetSupportedLanguagesResponse::~VRGetSupportedLanguagesResponse() {} void VRGetSupportedLanguagesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -54,8 +52,7 @@ void VRGetSupportedLanguagesResponse::Run() { (*message_)[strings::params][hmi_response::code].asInt()); if (hmi_apis::Common_Result::SUCCESS == code) { - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_vr_supported_languages( (*message_)[strings::msg_params][hmi_response::languages]); } 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 a5a3a2b62e..8c5e8bd49b 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 @@ -36,12 +36,11 @@ namespace application_manager { namespace commands { -VRIsReadyRequest::VRIsReadyRequest(const MessageSharedPtr& message) - : RequestToHMI(message) { -} +VRIsReadyRequest::VRIsReadyRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VRIsReadyRequest::~VRIsReadyRequest() { -} +VRIsReadyRequest::~VRIsReadyRequest() {} void VRIsReadyRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,4 +51,3 @@ void VRIsReadyRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vr_is_ready_response.cc b/src/components/application_manager/src/commands/hmi/vr_is_ready_response.cc index a0de7ae33a..617742a28c 100644 --- a/src/components/application_manager/src/commands/hmi/vr_is_ready_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_is_ready_response.cc @@ -30,18 +30,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/vr_is_ready_response.h" -#include "application_manager/application_manager_impl.h" namespace application_manager { namespace commands { -VRIsReadyResponse::VRIsReadyResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} +VRIsReadyResponse::VRIsReadyResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VRIsReadyResponse::~VRIsReadyResponse() { -} +VRIsReadyResponse::~VRIsReadyResponse() {} void VRIsReadyResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -52,8 +50,7 @@ void VRIsReadyResponse::Run() { is_available = object[strings::msg_params][strings::available].asBool(); } - HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + HMICapabilities& hmi_capabilities = application_manager_.hmi_capabilities(); hmi_capabilities.set_is_vr_cooperating(is_available); } diff --git a/src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc index 1791bab57a..c4646e59f4 100644 --- a/src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc +++ b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_request.cc @@ -37,12 +37,10 @@ namespace application_manager { namespace commands { VRPerformInteractionRequest::VRPerformInteractionRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} -VRPerformInteractionRequest::~VRPerformInteractionRequest() { -} +VRPerformInteractionRequest::~VRPerformInteractionRequest() {} void VRPerformInteractionRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -53,4 +51,3 @@ void VRPerformInteractionRequest::Run() { } // namespace commands } // namespace application_manager - diff --git a/src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc index 8fc22ce872..bb5ceb3755 100644 --- a/src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc +++ b/src/components/application_manager/src/commands/hmi/vr_perform_interaction_response.cc @@ -37,18 +37,16 @@ namespace application_manager { namespace commands { VRPerformInteractionResponse::VRPerformInteractionResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { -} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} -VRPerformInteractionResponse::~VRPerformInteractionResponse() { -} +VRPerformInteractionResponse::~VRPerformInteractionResponse() {} void VRPerformInteractionResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::VR_PerformInteraction); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace commands |