diff options
Diffstat (limited to 'src')
466 files changed, 1155 insertions, 1064 deletions
diff --git a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h index 5122a0856b..4a74d38ee1 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_request.h @@ -49,7 +49,7 @@ class ActivateAppRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit ActivateAppRequest(const MessageSharedPtr& message); + explicit ActivateAppRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief ActivateAppRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h index a15d317077..3e3b7c3d4e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/activate_app_response.h @@ -49,7 +49,7 @@ class ActivateAppResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit ActivateAppResponse(const MessageSharedPtr& message); + explicit ActivateAppResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief ActivateAppResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h index 1aa3b7a512..613121029e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/add_statistics_info_notification.h @@ -49,7 +49,7 @@ class AddStatisticsInfoNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit AddStatisticsInfoNotification(const MessageSharedPtr& message); + explicit AddStatisticsInfoNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief AddStatisticsInfoNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h index 3d42b6d5a6..3e0d3ff715 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_request.h @@ -49,7 +49,7 @@ class AllowAllAppsRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit AllowAllAppsRequest(const MessageSharedPtr& message); + explicit AllowAllAppsRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief AllowAllAppsRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h index ccc8d5ae7d..c74aa39c21 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_all_apps_response.h @@ -49,7 +49,7 @@ class AllowAllAppsResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit AllowAllAppsResponse(const MessageSharedPtr& message); + explicit AllowAllAppsResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief AllowAllAppsResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h index e90576a7df..1a01e0ecf7 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_request.h @@ -49,7 +49,7 @@ class AllowAppRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit AllowAppRequest(const MessageSharedPtr& message); + explicit AllowAppRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief AllowAppRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h index 6bedf30a38..f60de5e9ec 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/allow_app_response.h @@ -49,7 +49,7 @@ class AllowAppResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit AllowAppResponse(const MessageSharedPtr& message); + explicit AllowAppResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief AllowAppResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h index 867596f189..f3e1fb314e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_request.h @@ -49,7 +49,7 @@ class BasicCommunicationSystemRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit BasicCommunicationSystemRequest(const MessageSharedPtr& message); + explicit BasicCommunicationSystemRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief BasicCommunicationSystemRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h index 5c174eac85..62cc2349b8 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/basic_communication_system_response.h @@ -49,7 +49,7 @@ class BasicCommunicationSystemResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit BasicCommunicationSystemResponse(const MessageSharedPtr& message); + explicit BasicCommunicationSystemResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief BasicCommunicationSystemResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h index 639800a047..46a9475d27 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_request.h @@ -49,7 +49,7 @@ class ButtonGetCapabilitiesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit ButtonGetCapabilitiesRequest(const MessageSharedPtr& message); + explicit ButtonGetCapabilitiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief ButtonGetCapabilitiesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h index 7cd174477b..607bec8be2 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/button_get_capabilities_response.h @@ -49,7 +49,7 @@ class ButtonGetCapabilitiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit ButtonGetCapabilitiesResponse(const MessageSharedPtr& message); + explicit ButtonGetCapabilitiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief ButtonGetCapabilitiesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h index 34722bc4f1..af2f949757 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_request.h @@ -49,7 +49,7 @@ class ClosePopupRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit ClosePopupRequest(const MessageSharedPtr& message); + explicit ClosePopupRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief ClosePopupRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h index ce3a6d2936..b0695168f5 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/close_popup_response.h @@ -49,7 +49,7 @@ class ClosePopupResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit ClosePopupResponse(const MessageSharedPtr& message); + explicit ClosePopupResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief ClosePopupResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/dial_number_request.h b/src/components/application_manager/include/application_manager/commands/hmi/dial_number_request.h index 59ad705e80..4d104d7ca1 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/dial_number_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/dial_number_request.h @@ -50,7 +50,7 @@ class DialNumberRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit DialNumberRequest(const MessageSharedPtr& message); + explicit DialNumberRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief DialNumberRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/dial_number_response.h b/src/components/application_manager/include/application_manager/commands/hmi/dial_number_response.h index d6c1401783..ccbd3a55ac 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/dial_number_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/dial_number_response.h @@ -51,7 +51,7 @@ class DialNumberResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit DialNumberResponse(const MessageSharedPtr& message); + explicit DialNumberResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief DialNumberResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h index 8262dbb6fa..32857a512b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_request.h @@ -49,7 +49,7 @@ class GetSystemInfoRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit GetSystemInfoRequest(const MessageSharedPtr& message); + explicit GetSystemInfoRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief GetSystemInfoRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h index 9f57a492ac..fda2940d17 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/get_system_info_response.h @@ -34,6 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_SYSTEM_INFO_RESPONSE_H_ #include "application_manager/commands/hmi/response_from_hmi.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -55,7 +56,7 @@ class GetSystemInfoResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit GetSystemInfoResponse(const MessageSharedPtr& message); + explicit GetSystemInfoResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief GetSystemInfoResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h b/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h index 551ab20431..916a6352f5 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h @@ -48,7 +48,7 @@ class GetUrls : public RequestFromHMI { * * @param message Incoming SmartObject message **/ - explicit GetUrls(const MessageSharedPtr& message); + explicit GetUrls(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief GetUrls class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h b/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h index 956e5a788e..fb2077e5bd 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/get_urls_response.h @@ -45,7 +45,7 @@ class GetUrlsResponse : public ResponseToHMI { * * @param message Incoming SmartObject message **/ - explicit GetUrlsResponse(const MessageSharedPtr& message); + explicit GetUrlsResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief GetUrlsResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h index 2957693c9e..84c488fef4 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_request.h @@ -49,7 +49,7 @@ class MixingAudioSupportedRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit MixingAudioSupportedRequest(const MessageSharedPtr& message); + explicit MixingAudioSupportedRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief MixingAudioSupportedRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h index e2b5affe34..581ed708ae 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/mixing_audio_supported_response.h @@ -49,7 +49,7 @@ class MixingAudioSupportedResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit MixingAudioSupportedResponse(const MessageSharedPtr& message); + explicit MixingAudioSupportedResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief MixingAudioSupportedResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h index 58f85f829a..f98b1d6f04 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_request.h @@ -49,7 +49,7 @@ class NaviAlertManeuverRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit NaviAlertManeuverRequest(const MessageSharedPtr& message); + explicit NaviAlertManeuverRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief NaviAlertManeuverRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h index 11f46d5da8..ae919cce76 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_alert_maneuver_response.h @@ -49,7 +49,7 @@ class NaviAlertManeuverResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit NaviAlertManeuverResponse(const MessageSharedPtr& message); + explicit NaviAlertManeuverResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief NaviAlertManeuverResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h index 3e95c6b16b..86c0da947c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_request.h @@ -50,7 +50,7 @@ class AudioStartStreamRequest : public RequestToHMI, * * @param message Incoming SmartObject message **/ - explicit AudioStartStreamRequest(const MessageSharedPtr& message); + explicit AudioStartStreamRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnNaviStartStreamRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_response.h index 01992eb3b7..ca080a9dcd 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_start_stream_response.h @@ -48,7 +48,7 @@ class AudioStartStreamResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit AudioStartStreamResponse(const MessageSharedPtr& message); + explicit AudioStartStreamResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief AudioStartStreamResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_request.h index 04bba8b752..df32f1d49b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_request.h @@ -48,7 +48,7 @@ class AudioStopStreamRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit AudioStopStreamRequest(const MessageSharedPtr& message); + explicit AudioStopStreamRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief NaviStopStreamRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_response.h index 7275ac34d8..0f45f03746 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_audio_stop_stream_response.h @@ -48,7 +48,7 @@ class AudioStopStreamResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit AudioStopStreamResponse(const MessageSharedPtr& message); + explicit AudioStopStreamResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnNaviStopStreamResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_request.h index 1209e2b4cb..57c24aeff7 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_request.h @@ -50,7 +50,8 @@ public: * * @param message Incoming SmartObject message **/ - explicit NaviGetWayPointsRequest(const MessageSharedPtr& message); + NaviGetWayPointsRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviGetWayPointsRequest class destructor **/ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_response.h index 3e6a011300..4a9b848adc 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_get_way_points_response.h @@ -50,7 +50,8 @@ class NaviGetWayPointsResponse * * @param message Incoming SmartObject message **/ - explicit NaviGetWayPointsResponse(const MessageSharedPtr& message); + NaviGetWayPointsResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviGetWaypoints class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h index e779ecb699..ab36b3844d 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_request.h @@ -49,7 +49,7 @@ class NaviIsReadyRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit NaviIsReadyRequest(const MessageSharedPtr& message); + explicit NaviIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief NaviIsReadyRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h index 3da6933bc3..8279aefa3b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_is_ready_response.h @@ -49,7 +49,7 @@ class NaviIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit NaviIsReadyResponse(const MessageSharedPtr& message); + explicit NaviIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief NaviIsReadyResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h index 45474b532a..9929c1e658 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_request.h @@ -49,7 +49,7 @@ class NaviSendLocationRequest : public RequestToHMI { * * @param message Incoming SmartObject message */ - explicit NaviSendLocationRequest(const MessageSharedPtr& message); + explicit NaviSendLocationRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief NaviSendLocationRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h index ef9a605c36..1629cf3228 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_send_location_response.h @@ -49,7 +49,7 @@ class NaviSendLocationResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message */ - explicit NaviSendLocationResponse(const MessageSharedPtr& message); + explicit NaviSendLocationResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief NaviSendLocationResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h index b866ce3e1f..1c4bf0d6dd 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_request.h @@ -49,7 +49,7 @@ class NaviShowConstantTBTRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit NaviShowConstantTBTRequest(const MessageSharedPtr& message); + explicit NaviShowConstantTBTRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief NaviShowConstantTBTRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h index 3f212985f9..008eaa5a7f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_show_constant_tbt_response.h @@ -49,7 +49,7 @@ class NaviShowConstantTBTResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit NaviShowConstantTBTResponse(const MessageSharedPtr& message); + explicit NaviShowConstantTBTResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief NaviShowConstantTBTResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h index 0e8cd39cc9..93eb3ebbe3 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_request.h @@ -50,7 +50,7 @@ class NaviStartStreamRequest : public RequestToHMI, * * @param message Incoming SmartObject message **/ - explicit NaviStartStreamRequest(const MessageSharedPtr& message); + explicit NaviStartStreamRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnNaviStartStreamRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_response.h index c94b6f219c..35c11ed20a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_start_stream_response.h @@ -48,7 +48,7 @@ class NaviStartStreamResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit NaviStartStreamResponse(const MessageSharedPtr& message); + explicit NaviStartStreamResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief NaviStartStreamResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_request.h index 86b0981c22..f62182618a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_request.h @@ -48,7 +48,7 @@ class NaviStopStreamRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit NaviStopStreamRequest(const MessageSharedPtr& message); + explicit NaviStopStreamRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief NaviStopStreamRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_response.h index 6f4986e4c7..c3149f2f12 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_stop_stream_response.h @@ -48,7 +48,7 @@ class NaviStopStreamResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit NaviStopStreamResponse(const MessageSharedPtr& message); + explicit NaviStopStreamResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnNaviStopStreamResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_request.h index cdaff0bdc6..57bddf9c9d 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_request.h @@ -50,7 +50,8 @@ public: * * @param message Incoming SmartObject message **/ - explicit NaviSubscribeWayPointsRequest(const MessageSharedPtr& message); + NaviSubscribeWayPointsRequest(const MessageSharedPtr& messag, + ApplicationManager& application_manager); /** * @brief NaviSubscribeWayPointsRequest class destructor **/ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h index d6637c709c..a60e9ce094 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_subscribe_way_points_response.h @@ -50,7 +50,8 @@ class NaviSubscribeWayPointsResponse * * @param message Incoming SmartObject message **/ - explicit NaviSubscribeWayPointsResponse(const MessageSharedPtr& message); + NaviSubscribeWayPointsResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviSubscribeWaypoints class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_request.h index 3191fb375b..6566a2a841 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_request.h @@ -50,7 +50,8 @@ public: * * @param message Incoming SmartObject message **/ - explicit NaviUnSubscribeWayPointsRequest(const MessageSharedPtr& message); + NaviUnSubscribeWayPointsRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviUnSubscribeWayPointsRequest class destructor **/ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_response.h index 9ae12f7def..62d7900646 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_unsubscribe_way_points_response.h @@ -50,7 +50,8 @@ class NaviUnsubscribeWayPointsResponse * * @param message Incoming SmartObject message **/ - explicit NaviUnsubscribeWayPointsResponse(const MessageSharedPtr& message); + NaviUnsubscribeWayPointsResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); /** * @brief NaviUnSubscribeWaypoints class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h index a5e2f8bf37..3a166f3b1e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_request.h @@ -49,7 +49,7 @@ class NaviUpdateTurnListRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit NaviUpdateTurnListRequest(const MessageSharedPtr& message); + explicit NaviUpdateTurnListRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief NaviUpdateTurnListRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h index 0e15a9175c..6062122935 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/navi_update_turn_list_response.h @@ -49,7 +49,7 @@ class NaviUpdateTurnListResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit NaviUpdateTurnListResponse(const MessageSharedPtr& message); + explicit NaviUpdateTurnListResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief NaviUpdateTurnListResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/notification_from_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/notification_from_hmi.h index 1dcae4366d..bdd2829ab6 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/notification_from_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/notification_from_hmi.h @@ -50,7 +50,8 @@ namespace smart_objects = NsSmartDeviceLink::NsSmartObjects; class NotificationFromHMI : public CommandImpl { public: - explicit NotificationFromHMI(const MessageSharedPtr& message); + explicit NotificationFromHMI(const MessageSharedPtr& message, + ApplicationManager& application_manager); virtual ~NotificationFromHMI(); virtual bool Init(); virtual bool CleanUp(); diff --git a/src/components/application_manager/include/application_manager/commands/hmi/notification_to_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/notification_to_hmi.h index 2372754b63..d53ea9e8b2 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/notification_to_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/notification_to_hmi.h @@ -41,7 +41,8 @@ namespace commands { class NotificationToHMI : public CommandImpl { public: - explicit NotificationToHMI(const MessageSharedPtr& message); + explicit NotificationToHMI(const MessageSharedPtr& message, + ApplicationManager& application_manager); virtual ~NotificationToHMI(); virtual bool Init(); virtual bool CleanUp(); diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h index 6ec14e35b0..5b29704263 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_allow_sdl_functionality_notification.h @@ -49,7 +49,7 @@ class OnAllowSDLFunctionalityNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnAllowSDLFunctionalityNotification(const MessageSharedPtr& message); + explicit OnAllowSDLFunctionalityNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnAllowSDLFunctionalityNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h index 011df3832c..9c12bec1b2 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_activated_notification.h @@ -49,7 +49,7 @@ class OnAppActivatedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnAppActivatedNotification(const MessageSharedPtr& message); + explicit OnAppActivatedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnAppActivatedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h index 8731fc43f1..a33560b03d 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_deactivated_notification.h @@ -49,7 +49,7 @@ class OnAppDeactivatedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnAppDeactivatedNotification(const MessageSharedPtr& message); + explicit OnAppDeactivatedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnAppDeactivatedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h index c6ea82a15c..72e62fbb8b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_changed_notification.h @@ -49,7 +49,7 @@ class OnAppPermissionChangedNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - explicit OnAppPermissionChangedNotification(const MessageSharedPtr& message); + explicit OnAppPermissionChangedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnAppPermissionChangedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h index ea36d55b39..cd18143604 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_permission_consent_notification.h @@ -49,7 +49,7 @@ class OnAppPermissionConsentNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnAppPermissionConsentNotification(const MessageSharedPtr& message); + explicit OnAppPermissionConsentNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnAppPermissionConsentNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h index 1ebbfcd483..6a903661c9 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_registered_notification.h @@ -49,7 +49,7 @@ class OnAppRegisteredNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - explicit OnAppRegisteredNotification(const MessageSharedPtr& message); + explicit OnAppRegisteredNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnAppRegisteredNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h index 96fd19e9bc..e619dc325e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_app_unregistered_notification.h @@ -49,7 +49,7 @@ class OnAppUnregisteredNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - explicit OnAppUnregisteredNotification(const MessageSharedPtr& message); + explicit OnAppUnregisteredNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnAppUnregisteredNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_audio_data_streaming_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_audio_data_streaming_notification.h index 97a979065e..7cf40fbb20 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_audio_data_streaming_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_audio_data_streaming_notification.h @@ -49,7 +49,7 @@ class OnAudioDataStreamingNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - explicit OnAudioDataStreamingNotification(const MessageSharedPtr& message); + explicit OnAudioDataStreamingNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnAudioDataStreamingNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h index 0a56d7d924..ac908d5592 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_button_event_notification.h @@ -53,7 +53,7 @@ class OnButtonEventNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnButtonEventNotification(const MessageSharedPtr& message); + explicit OnButtonEventNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief Execute command diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h index ce5f1de8f1..d50a3f6a59 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_button_press_notification.h @@ -53,7 +53,7 @@ class OnButtonPressNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnButtonPressNotification(const MessageSharedPtr& message); + explicit OnButtonPressNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief Execute command diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_button_subscription_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_button_subscription_notification.h index c046380cd7..99c3d02e1c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_button_subscription_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_button_subscription_notification.h @@ -51,7 +51,7 @@ class OnButtonSubscriptionNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - explicit OnButtonSubscriptionNotification(const MessageSharedPtr& message); + explicit OnButtonSubscriptionNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnButtonSubscriptionNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h index 17ba26b7f7..5d3a06956e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_device_chosen_notification.h @@ -49,7 +49,7 @@ class OnDeviceChosenNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnDeviceChosenNotification(const MessageSharedPtr& message); + explicit OnDeviceChosenNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnDeviceChosenNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h index b87a6e2d9f..91a7adbe4b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_device_state_changed_notification.h @@ -49,7 +49,7 @@ class OnDeviceStateChangedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnDeviceStateChangedNotification(const MessageSharedPtr& message); + explicit OnDeviceStateChangedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnDeviceStateChangedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h index 01a87aae05..f6eff5833b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_driver_distraction_notification.h @@ -53,7 +53,7 @@ class OnDriverDistractionNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnDriverDistractionNotification(const MessageSharedPtr& message); + explicit OnDriverDistractionNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnDriverDistractionNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_event_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_event_changed_notification.h index b40bfb6ca0..4da565b4ee 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_event_changed_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_event_changed_notification.h @@ -49,7 +49,7 @@ class OnEventChangedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnEventChangedNotification(const MessageSharedPtr& message); + explicit OnEventChangedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnEventChangedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h index 65d78f60c6..ea0e64783b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_all_applications_notification.h @@ -49,7 +49,7 @@ class OnExitAllApplicationsNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnExitAllApplicationsNotification(const MessageSharedPtr& message); + explicit OnExitAllApplicationsNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnExitAllApplicationsNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h index 479dd3a09c..71966066a7 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_exit_application_notification.h @@ -49,7 +49,7 @@ class OnExitApplicationNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnExitApplicationNotification(const MessageSharedPtr& message); + explicit OnExitApplicationNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnExitApplicationNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h index cc47705c82..479e8c28ff 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_file_removed_notification.h @@ -49,7 +49,7 @@ class OnFileRemovedNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - explicit OnFileRemovedNotification(const MessageSharedPtr& message); + explicit OnFileRemovedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnFileRemovedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h b/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h index f9fb9cdb21..96e9104bde 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_find_applications.h @@ -49,7 +49,7 @@ class OnFindApplications : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnFindApplications(const MessageSharedPtr& message); + explicit OnFindApplications(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnFindApplications class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h index f8fccdc382..620ea1bc6e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ignition_cycle_over_notification.h @@ -50,7 +50,7 @@ class OnIgnitionCycleOverNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnIgnitionCycleOverNotification(const MessageSharedPtr& message); + explicit OnIgnitionCycleOverNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnIgnitionCycleOverNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h index a657ffcc68..9e520d26c5 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_navi_tbt_client_state_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_NAVI_TBT_CLIENT_STATE_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnNaviTBTClientStateNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnNaviTBTClientStateNotification(const MessageSharedPtr& message); + explicit OnNaviTBTClientStateNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnNaviTBTClientStateNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_navi_way_point_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_navi_way_point_change_notification.h index 85c46a5b5a..3f88beeb1e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_navi_way_point_change_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_navi_way_point_change_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_NAVI_WAY_POINT_CHANGE_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,8 @@ class OnNaviWayPointChangeNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnNaviWayPointChangeNotification(const MessageSharedPtr& message); + explicit OnNaviWayPointChangeNotification(const MessageSharedPtr& message, + ApplicationManager& app_man); /** * @brief OnNaviWayPointChangeNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h b/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h index 81278fb75a..afd1e9a64a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_policy_update.h @@ -45,7 +45,7 @@ class OnPolicyUpdate : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnPolicyUpdate(const MessageSharedPtr& message); + explicit OnPolicyUpdate(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnPolicyUpdate class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h index bc60284309..ce6e0456a2 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_put_file_notification.h @@ -50,7 +50,7 @@ class OnPutFileNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - explicit OnPutFileNotification(const MessageSharedPtr& message); + explicit OnPutFileNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnPutFileNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h index 24fc52deac..898619f177 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ready_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_READY_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnReadyNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnReadyNotification(const MessageSharedPtr& message); + explicit OnReadyNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnReadyNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h b/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h index 0eeb28218f..c6c0a2d911 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_received_policy_update.h @@ -46,7 +46,7 @@ class OnReceivedPolicyUpdate : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnReceivedPolicyUpdate(const MessageSharedPtr& message); + explicit OnReceivedPolicyUpdate(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnReceivedPolicyUpdate class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h index 67cccdd816..1e84700ade 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_record_start_notification.h @@ -49,7 +49,7 @@ class OnRecordStartdNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - explicit OnRecordStartdNotification(const MessageSharedPtr& message); + explicit OnRecordStartdNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnRecordStartdNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h index 03f84d0907..59f7ec62de 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_resume_audio_source_notification.h @@ -50,7 +50,7 @@ class OnResumeAudioSourceNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - explicit OnResumeAudioSourceNotification(const MessageSharedPtr& message); + explicit OnResumeAudioSourceNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnResumeAudioSourceNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h index 5b9ac04e8f..3a17dd4d07 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_close_notification.h @@ -49,7 +49,7 @@ class OnSDLCloseNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - explicit OnSDLCloseNotification(const MessageSharedPtr& message); + explicit OnSDLCloseNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnSdlCloseNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h index 4f30873e4e..a1a2c949b3 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_consent_needed_notification.h @@ -49,7 +49,7 @@ class OnSDLConsentNeededNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - explicit OnSDLConsentNeededNotification(const MessageSharedPtr& message); + explicit OnSDLConsentNeededNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnSDLConsentNeededNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h index 6f8f3a6e1a..71a1afedaf 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_sdl_persistence_complete_notification.h @@ -49,7 +49,7 @@ class OnSDLPersistenceCompleteNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - explicit OnSDLPersistenceCompleteNotification(const MessageSharedPtr& message); + explicit OnSDLPersistenceCompleteNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnSDLPersistenceCompleteNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h b/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h index bfa14f67fc..0f860cb675 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_start_device_discovery.h @@ -49,7 +49,7 @@ class OnStartDeviceDiscovery : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnStartDeviceDiscovery(const MessageSharedPtr& message); + explicit OnStartDeviceDiscovery(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnStartDeviceDiscovery class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h index c123826886..c0b1d0256c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_status_update_notification.h @@ -49,7 +49,7 @@ class OnStatusUpdateNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - explicit OnStatusUpdateNotification(const MessageSharedPtr& message); + explicit OnStatusUpdateNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnGetStatusUpdateNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h index b410c7b397..133ecc4b5e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_context_notification.h @@ -51,7 +51,7 @@ class OnSystemContextNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnSystemContextNotification(const MessageSharedPtr& message); + explicit OnSystemContextNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnSystemContextNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h index ee7df7acd6..5994c588d3 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_error_notification.h @@ -49,7 +49,7 @@ class OnSystemErrorNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnSystemErrorNotification(const MessageSharedPtr& message); + explicit OnSystemErrorNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnSystemErrorNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h index 9b6c62782c..c09cb85da2 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_info_changed_notification.h @@ -49,7 +49,7 @@ class OnSystemInfoChangedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnSystemInfoChangedNotification(const MessageSharedPtr& message); + explicit OnSystemInfoChangedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnSystemInfoChangedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h index f1d25e24a4..9b4beee1b8 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_system_request_notification.h @@ -50,7 +50,7 @@ class OnSystemRequestNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnSystemRequestNotification(const MessageSharedPtr& message); + explicit OnSystemRequestNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnSystemRequestNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h index 79ae9b496e..c97554db99 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_language_change_notification.h @@ -49,7 +49,7 @@ class OnTTSLanguageChangeNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnTTSLanguageChangeNotification(const MessageSharedPtr& message); + explicit OnTTSLanguageChangeNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnTTSLanguageChangeNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h index 11cb755544..f5fcb07370 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_reset_timeout_notification.h @@ -51,7 +51,7 @@ class OnTTSResetTimeoutNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnTTSResetTimeoutNotification(const MessageSharedPtr& message); + explicit OnTTSResetTimeoutNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnTTSResetTimeoutNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h index c7e88ac558..e120d19519 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_started_notification.h @@ -49,7 +49,7 @@ class OnTTSStartedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnTTSStartedNotification(const MessageSharedPtr& message); + explicit OnTTSStartedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnTTSStartedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h index bf5dc7fb9e..22b98bb912 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_tts_stopped_notification.h @@ -49,7 +49,7 @@ class OnTTSStoppedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject OnTTSStartedNotificationmessage **/ - explicit OnTTSStoppedNotification(const MessageSharedPtr& message); + explicit OnTTSStoppedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnTTSStoppedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h index b4a0228c78..70ea3c18a4 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_command_notification.h @@ -49,7 +49,7 @@ class OnUICommandNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnUICommandNotification(const MessageSharedPtr& message); + explicit OnUICommandNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnUICommandNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h index 77b771065b..2d335b8938 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_keyboard_input_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_KEYBOARD_INPUT_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -52,7 +52,7 @@ class OnUIKeyBoardInputNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnUIKeyBoardInputNotification(const MessageSharedPtr& message); + explicit OnUIKeyBoardInputNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnUIKeyBoardInputNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h index bcb661c89d..f37b8c245f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_language_change_notification.h @@ -49,7 +49,7 @@ class OnUILanguageChangeNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnUILanguageChangeNotification(const MessageSharedPtr& message); + explicit OnUILanguageChangeNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnUILanguageChangeNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h index f97c8768b5..cdde8eabb0 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_reset_timeout_notification.h @@ -51,7 +51,7 @@ class OnUIResetTimeoutNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnUIResetTimeoutNotification(const MessageSharedPtr& message); + explicit OnUIResetTimeoutNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnUIResetTimeoutNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h index 6d8005e12f..d3e4050bc8 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_ui_touch_event_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_UI_TOUCH_EVENT_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -52,7 +52,7 @@ class OnUITouchEventNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnUITouchEventNotification(const MessageSharedPtr& message); + explicit OnUITouchEventNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnUITouchEventNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h b/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h index f56d01a5cc..66cf26856d 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_update_device_list.h @@ -49,7 +49,7 @@ class OnUpdateDeviceList : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnUpdateDeviceList(const MessageSharedPtr& message); + explicit OnUpdateDeviceList(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnUpdateDeviceList class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h index d591ab2be6..44a5b2df57 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_acc_pedal_position_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ACC_PEDAL_POSITION_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIAccPedalPositionNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIAccPedalPositionNotification(const MessageSharedPtr& message); + explicit OnVIAccPedalPositionNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIAccPedalPositionNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h index f901462fdf..e09bfb36d1 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_belt_status_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_BELT_STATUS_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIBeltStatusNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIBeltStatusNotification(const MessageSharedPtr& message); + explicit OnVIBeltStatusNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIBeltStatusNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h index a0bc31778a..67076fc02c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_body_information_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_BODY_INFORMATION_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIBodyInformationNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIBodyInformationNotification(const MessageSharedPtr& message); + explicit OnVIBodyInformationNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIBodyInformationNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h index 0e24616f3e..dfcfc7e9e7 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_device_status_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_DEVICE_STATUS_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIDeviceStatusNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIDeviceStatusNotification(const MessageSharedPtr& message); + explicit OnVIDeviceStatusNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIDeviceStatusNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h index 0290388756..003cffb7ab 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_driver_braking_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_DRIVER_BRAKING_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIDriverBrakingNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIDriverBrakingNotification(const MessageSharedPtr& message); + explicit OnVIDriverBrakingNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIDriverBrakingNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h index 8307e5359e..490d9258ec 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_engine_torque_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ENGINE_TORQUE_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIEngineTorqueNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIEngineTorqueNotification(const MessageSharedPtr& message); + explicit OnVIEngineTorqueNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIEngineTorqueNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h index be5b086853..317fe2fde5 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_external_temperature_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_EXTERNAL_TEMPERATURE_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIExternalTemperatureNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIExternalTemperatureNotification(const MessageSharedPtr& message); + explicit OnVIExternalTemperatureNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIExternalTemperatureNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h index 83e6f845e0..1df9903180 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_FUEL_LEVEL_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIFuelLevelNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIFuelLevelNotification(const MessageSharedPtr& message); + explicit OnVIFuelLevelNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIFuelLevelNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h index 42a6b8e0d9..29715de867 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_fuel_level_state_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_FUEL_LEVEL_STATE_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIFuelLevelStateNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIFuelLevelStateNotification(const MessageSharedPtr& message); + explicit OnVIFuelLevelStateNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIFuelLevelStateNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h index 01c2cf60b6..a36a4a5f6f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_gps_data_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_GPS_DATA_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIGpsDataNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIGpsDataNotification(const MessageSharedPtr& message); + explicit OnVIGpsDataNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIGpsDataNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h index dc80b33ddd..ab34a2c44d 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_head_lamp_status_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_HEAD_LAMP_STATUS_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIHeadLampStatusNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIHeadLampStatusNotification(const MessageSharedPtr& message); + explicit OnVIHeadLampStatusNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIHeadLampStatusNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h index c4e5accead..f144db5785 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_instant_fuel_consumption_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_INSTANT_FUEL_CONSUMPTION_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIInstantFuelConsumptionNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIInstantFuelConsumptionNotification(const MessageSharedPtr& message); + explicit OnVIInstantFuelConsumptionNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIInstantFuelConsumptionNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h index e2d9d91ae1..cc24c0d46a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_my_key_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_MY_KEY_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIMyKeyNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIMyKeyNotification(const MessageSharedPtr& message); + explicit OnVIMyKeyNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIMyKeyNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h index 7c1c691ac5..a3b8eed784 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_odometer_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_ODOMETER_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIOdometerNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIOdometerNotification(const MessageSharedPtr& message); + explicit OnVIOdometerNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIOdometerNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h index bf2ca83f8f..6f126783ec 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_prndl_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_PRNDL_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIPrndlNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIPrndlNotification(const MessageSharedPtr& message); + explicit OnVIPrndlNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIPrndlNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h index ebcfe3a86c..355e00e8b1 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_rpm_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_RPM_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIRpmNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIRpmNotification(const MessageSharedPtr& message); + explicit OnVIRpmNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIRpmNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h index 37bf66e4d0..36373f93c9 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_speed_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_SPEED_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVISpeedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVISpeedNotification(const MessageSharedPtr& message); + explicit OnVISpeedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVISpeedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h index bf01b2bf76..1d8a63dd0e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_steering_wheel_angle_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_STEERING_WHEEL_ANGLE_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVISteeringWheelAngleNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVISteeringWheelAngleNotification(const MessageSharedPtr& message); + explicit OnVISteeringWheelAngleNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVISteeringWheelAngleNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h index 1c1e00d893..43ef0fb25c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_tire_pressure_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_TIRE_PRESSURE_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVITirePressureNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVITirePressureNotification(const MessageSharedPtr& message); + explicit OnVITirePressureNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVITirePressureNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h index 59da271a04..758d30c632 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vehicle_data_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_VEHICLE_DATA_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -51,7 +51,7 @@ class OnVIVehicleDataNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIVehicleDataNotification(const MessageSharedPtr& message); + explicit OnVIVehicleDataNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIVehicleDataNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h index 06b73c508d..22ac173110 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_vin_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_VIN_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIVinNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIVinNotification(const MessageSharedPtr& message); + explicit OnVIVinNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIVinNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h index 399b38112e..b512155240 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vi_wiper_status_notification.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_ON_VI_WIPER_STATUS_NOTIFICATION_H_ #include "application_manager/commands/hmi/notification_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -50,7 +50,7 @@ class OnVIWiperStatusNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVIWiperStatusNotification(const MessageSharedPtr& message); + explicit OnVIWiperStatusNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVIWiperStatusNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_video_data_streaming_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_video_data_streaming_notification.h index 38749ba8f8..3529c89c71 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_video_data_streaming_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_video_data_streaming_notification.h @@ -49,7 +49,7 @@ class OnVideoDataStreamingNotification : public NotificationToHMI { * * @param message Incoming SmartObject message **/ - explicit OnVideoDataStreamingNotification(const MessageSharedPtr& message); + explicit OnVideoDataStreamingNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVideoDataStreamingNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h index 37bc2556f8..ef3d11e375 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_command_notification.h @@ -50,7 +50,7 @@ class OnVRCommandNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVRCommandNotification(const MessageSharedPtr& message); + explicit OnVRCommandNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVRCommandNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h index be408f0aa0..ce95e9928c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_language_change_notification.h @@ -49,7 +49,7 @@ class OnVRLanguageChangeNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVRLanguageChangeNotification(const MessageSharedPtr& message); + explicit OnVRLanguageChangeNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVRLanguageChangeNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h index 5ae5ace27b..12bbe48860 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_started_notification.h @@ -49,7 +49,7 @@ class OnVRStartedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVRStartedNotification(const MessageSharedPtr& message); + explicit OnVRStartedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVRStartedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h index 311ee8acde..c815a74beb 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/on_vr_stopped_notification.h @@ -49,7 +49,7 @@ class OnVRStoppedNotification : public NotificationFromHMI { * * @param message Incoming SmartObject message **/ - explicit OnVRStoppedNotification(const MessageSharedPtr& message); + explicit OnVRStoppedNotification(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief OnVRStoppedNotification class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h index 9cb5a9f99d..c7a0d8ab3f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/request_from_hmi.h @@ -50,7 +50,8 @@ class RequestFromHMI : public CommandImpl, public event_engine::EventObserver { public: - explicit RequestFromHMI(const MessageSharedPtr& message); + explicit RequestFromHMI(const MessageSharedPtr& message, + ApplicationManager& application_manager); virtual ~RequestFromHMI(); virtual bool Init(); virtual bool CleanUp(); @@ -62,10 +63,15 @@ * @param function_id the function id for which response will be sent * @param result_code the result code. */ - void SendResponse(uint32_t correlation_id, - hmi_apis::FunctionID::eType function_id, - hmi_apis::Common_Result::eType result_code); - private: + void SendResponse(const bool success, + const uint32_t correlation_id, + const hmi_apis::FunctionID::eType function_id, + const hmi_apis::Common_Result::eType result_code); + + void FillCommonParametersOfSO(smart_objects::SmartObject* message, + uint32_t correlation_id, + hmi_apis::FunctionID::eType function_id); + private: DISALLOW_COPY_AND_ASSIGN(RequestFromHMI); }; diff --git a/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h index fe359182dd..4c36d7d01a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/request_to_hmi.h @@ -34,6 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_REQUEST_TO_HMI_H_ #include "application_manager/commands/command_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -42,7 +43,8 @@ namespace commands { class RequestToHMI : public CommandImpl { public: - explicit RequestToHMI(const MessageSharedPtr& message); + explicit RequestToHMI(const MessageSharedPtr& message, + ApplicationManager& application_manager); virtual ~RequestToHMI(); virtual bool Init(); virtual bool CleanUp(); diff --git a/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h index 7769caa0a7..f644f9bb4a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/response_from_hmi.h @@ -34,6 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_RESPONSE_FROM_HMI_H_ #include "application_manager/commands/command_impl.h" +#include "application_manager/application_manager.h" #include "interfaces/HMI_API.h" namespace NsSmartDeviceLink { @@ -50,12 +51,13 @@ namespace smart_objects = NsSmartDeviceLink::NsSmartObjects; class ResponseFromHMI : public CommandImpl { public: - explicit ResponseFromHMI(const MessageSharedPtr& message); + explicit ResponseFromHMI(const MessageSharedPtr& message, + ApplicationManager& application_manager); virtual ~ResponseFromHMI(); virtual bool Init(); virtual bool CleanUp(); virtual void Run(); - void SendResponseToMobile(const MessageSharedPtr& message); + void SendResponseToMobile(const MessageSharedPtr& message, ApplicationManager& application_manager); /* * @brief Creates HMI request diff --git a/src/components/application_manager/include/application_manager/commands/hmi/response_to_hmi.h b/src/components/application_manager/include/application_manager/commands/hmi/response_to_hmi.h index ce9e9469d0..4ca2813cae 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/response_to_hmi.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/response_to_hmi.h @@ -51,7 +51,8 @@ namespace NsSmart = NsSmartDeviceLink::NsSmartObjects; class ResponseToHMI : public CommandImpl { public: - explicit ResponseToHMI(const MessageSharedPtr& message); + explicit ResponseToHMI(const MessageSharedPtr& message, + ApplicationManager& application_manager); virtual ~ResponseToHMI(); virtual bool Init(); virtual bool CleanUp(); diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h index 58a7e9ecda..4222dd78b2 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_request.h @@ -34,7 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_SDL_ACTIVATE_APP_REQUEST_H_ #include "application_manager/commands/hmi/request_from_hmi.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -51,7 +51,7 @@ class SDLActivateAppRequest : public RequestFromHMI { * * @param message Incoming SmartObject message **/ - explicit SDLActivateAppRequest(const MessageSharedPtr& message); + explicit SDLActivateAppRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief SDLActivateAppRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h index bf0789e60e..d7b82aa023 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_activate_app_response.h @@ -49,7 +49,7 @@ class SDLActivateAppResponse : public ResponseToHMI { * * @param message Incoming SmartObject message **/ - explicit SDLActivateAppResponse(const MessageSharedPtr& message); + explicit SDLActivateAppResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief SDLActivateAppResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h index 7c8f10529b..8fa2c1f2f6 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_request.h @@ -49,7 +49,7 @@ class SDLGetListOfPermissionsRequest : public RequestFromHMI { * * @param message Incoming SmartObject message **/ - explicit SDLGetListOfPermissionsRequest(const MessageSharedPtr& message); + explicit SDLGetListOfPermissionsRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief SDLGetListOfPermissionsRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h index 452784d92c..d4fadd3099 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_list_of_permissions_response.h @@ -49,7 +49,7 @@ class SDLGetListOfPermissionsResponse : public ResponseToHMI { * * @param message Incoming SmartObject message **/ - explicit SDLGetListOfPermissionsResponse(const MessageSharedPtr& message); + explicit SDLGetListOfPermissionsResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief SDLGetListOfPermissionsResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h index cb7d37d336..6778fb7be2 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_request.h @@ -49,7 +49,7 @@ class SDLGetStatusUpdateRequest : public RequestFromHMI { * * @param message Incoming SmartObject message **/ - explicit SDLGetStatusUpdateRequest(const MessageSharedPtr& message); + explicit SDLGetStatusUpdateRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief SDLGetStatusUpdateRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h index a3fc0862b5..ebb84cbf9e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_status_update_response.h @@ -49,7 +49,7 @@ class SDLGetStatusUpdateResponse : public ResponseToHMI { * * @param message Incoming SmartObject message **/ - explicit SDLGetStatusUpdateResponse(const MessageSharedPtr& message); + explicit SDLGetStatusUpdateResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief SDLGetStatusUpdateResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h index 96f46cfa3d..2998c6e395 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_request.h @@ -34,6 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_GET_USER_FRIENDLY_MESSAGE_REQUEST_H_ #include "application_manager/commands/hmi/request_from_hmi.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -49,7 +50,7 @@ class SDLGetUserFriendlyMessageRequest : public RequestFromHMI { * * @param message Incoming SmartObject message **/ - explicit SDLGetUserFriendlyMessageRequest(const MessageSharedPtr& message); + explicit SDLGetUserFriendlyMessageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief SDLGetUserFriendlyMessageRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h index 4cf7be56c9..047d31406d 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_get_user_friendly_message_response.h @@ -49,7 +49,7 @@ class SDLGetUserFriendlyMessageResponse : public ResponseToHMI { * * @param message Incoming SmartObject message **/ - explicit SDLGetUserFriendlyMessageResponse(const MessageSharedPtr& message); + explicit SDLGetUserFriendlyMessageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief SDLGetUserFriendlyMessageResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h index 481f37a257..581387373b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update.h @@ -46,7 +46,7 @@ class SDLPolicyUpdate : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit SDLPolicyUpdate(const MessageSharedPtr& message); + explicit SDLPolicyUpdate(const MessageSharedPtr& message, ApplicationManager& application_manager); virtual ~SDLPolicyUpdate(); /** * @brief Execute command diff --git a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h index d3f7105523..a9e1542a78 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/sdl_policy_update_response.h @@ -46,7 +46,7 @@ class SDLPolicyUpdateResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit SDLPolicyUpdateResponse(const MessageSharedPtr& message); + explicit SDLPolicyUpdateResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief SDLPolicyUpdateResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h index a25309e5d5..52233c5931 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_request.h @@ -49,7 +49,7 @@ class TTSChangeRegistrationRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit TTSChangeRegistrationRequest(const MessageSharedPtr& message); + explicit TTSChangeRegistrationRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSChangeRegistrationRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h index 73ad180286..44140d1486 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_change_registration_response.h @@ -49,7 +49,7 @@ class TTSChangeRegistratioResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit TTSChangeRegistratioResponse(const MessageSharedPtr& message); + explicit TTSChangeRegistratioResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSChangeRegistratioResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h index 543945e8ef..b066e46766 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_request.h @@ -49,7 +49,7 @@ class TTSGetCapabilitiesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit TTSGetCapabilitiesRequest(const MessageSharedPtr& message); + explicit TTSGetCapabilitiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSGetCapabilitiesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h index 2fc16d1a40..6b7761b0da 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_capabilities_response.h @@ -49,7 +49,7 @@ class TTSGetCapabilitiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit TTSGetCapabilitiesResponse(const MessageSharedPtr& message); + explicit TTSGetCapabilitiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSGetCapabilitiesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h index e0ae0da0c4..8c34d63d6e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_request.h @@ -49,7 +49,7 @@ class TTSGetLanguageRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit TTSGetLanguageRequest(const MessageSharedPtr& message); + explicit TTSGetLanguageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSGetLanguageRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h index 0d9df07ae6..59da36b5d0 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_language_response.h @@ -49,7 +49,7 @@ class TTSGetLanguageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit TTSGetLanguageResponse(const MessageSharedPtr& message); + explicit TTSGetLanguageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSGetLanguageResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h index 136edbb5f4..6c4a39715d 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_request.h @@ -49,7 +49,7 @@ class TTSGetSupportedLanguagesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit TTSGetSupportedLanguagesRequest(const MessageSharedPtr& message); + explicit TTSGetSupportedLanguagesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSGetSupportedLanguagesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h index 38e3c673bb..1d6c8d3af9 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_get_supported_languages_response.h @@ -49,7 +49,7 @@ class TTSGetSupportedLanguagesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit TTSGetSupportedLanguagesResponse(const MessageSharedPtr& message); + explicit TTSGetSupportedLanguagesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSGetSupportedLanguagesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h index 676faabc01..fe45333741 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_request.h @@ -49,7 +49,7 @@ class TTSIsReadyRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit TTSIsReadyRequest(const MessageSharedPtr& message); + explicit TTSIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSIsReadyRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h index 12bb3bb870..6547f4704a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_is_ready_response.h @@ -49,7 +49,7 @@ class TTSIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit TTSIsReadyResponse(const MessageSharedPtr& message); + explicit TTSIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSIsReadyResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h index 92a260d77f..563fb1d5b4 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_request.h @@ -49,7 +49,7 @@ class TTSSetGlobalPropertiesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit TTSSetGlobalPropertiesRequest(const MessageSharedPtr& message); + explicit TTSSetGlobalPropertiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSSetGlobalPropertiesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h index 0766decf9f..5bb666fea2 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_set_global_properties_response.h @@ -49,7 +49,7 @@ class TTSSetGlobalPropertiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit TTSSetGlobalPropertiesResponse(const MessageSharedPtr& message); + explicit TTSSetGlobalPropertiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSSetGlobalPropertiesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h index f5555f6495..6464ea1bf9 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_request.h @@ -50,7 +50,7 @@ class TTSSpeakRequest * * @param message Incoming SmartObject message **/ - explicit TTSSpeakRequest(const MessageSharedPtr& message); + explicit TTSSpeakRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSSpeakRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h index 541ea0d2ab..8f8e12b046 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_speak_response.h @@ -50,7 +50,7 @@ class TTSSpeakResponse * * @param message Incoming SmartObject message **/ - explicit TTSSpeakResponse(const MessageSharedPtr& message); + explicit TTSSpeakResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSSpeakResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h index 46c464425d..8b4261f05d 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_request.h @@ -49,7 +49,7 @@ class TTSStopSpeakingRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit TTSStopSpeakingRequest(const MessageSharedPtr& message); + explicit TTSStopSpeakingRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSStopSpeakingRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h index aab8ca8c5b..2e703903e1 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/tts_stop_speaking_response.h @@ -49,7 +49,7 @@ class TTSStopSpeakingResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit TTSStopSpeakingResponse(const MessageSharedPtr& message); + explicit TTSStopSpeakingResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSStopSpeakingResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h index 6b857818e7..9bd59721ab 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_request.h @@ -49,7 +49,7 @@ class UIAddCommandRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIAddCommandRequest(const MessageSharedPtr& message); + explicit UIAddCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIAddCommandRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h index c6a02fdd03..596df9dcb8 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_command_response.h @@ -49,7 +49,7 @@ class UIAddCommandResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIAddCommandResponse(const MessageSharedPtr& message); + explicit UIAddCommandResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIAddCommandResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h index bba9a4c47e..9aba1075aa 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_request.h @@ -49,7 +49,7 @@ class UIAddSubmenuRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIAddSubmenuRequest(const MessageSharedPtr& message); + explicit UIAddSubmenuRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIAddSubmenuRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h index 0c4afc2fa3..5b432e1db3 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_add_submenu_response.h @@ -49,7 +49,7 @@ class UIAddSubmenuResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIAddSubmenuResponse(const MessageSharedPtr& message); + explicit UIAddSubmenuResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIAddSubmenuResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h index 72cd733eb5..65852b948c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_request.h @@ -49,7 +49,7 @@ class UIAlertRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIAlertRequest(const MessageSharedPtr& message); + explicit UIAlertRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIAlertRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h index 97eb2ba94b..92f31c0508 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_alert_response.h @@ -49,7 +49,7 @@ class UIAlertResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIAlertResponse(const MessageSharedPtr& message); + explicit UIAlertResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIAlertResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h index 8e68dee2ec..b781e68d74 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_request.h @@ -49,7 +49,7 @@ class UIChangeRegistrationRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIChangeRegistrationRequest(const MessageSharedPtr& message); + explicit UIChangeRegistrationRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIChangeRegistrationRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h index 50b092639b..5b36eb678b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_change_registration_response.h @@ -49,7 +49,7 @@ class UIChangeRegistratioResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIChangeRegistratioResponse(const MessageSharedPtr& message); + explicit UIChangeRegistratioResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIChangeRegistratioResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h index 9eceb2eb6f..42a61af6a3 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_request.h @@ -49,7 +49,7 @@ class UIDeleteCommandRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIDeleteCommandRequest(const MessageSharedPtr& message); + explicit UIDeleteCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIDeleteCommandRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h index c4d7ab6cac..a3948341de 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_command_response.h @@ -49,7 +49,7 @@ class UIDeleteCommandResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIDeleteCommandResponse(const MessageSharedPtr& message); + explicit UIDeleteCommandResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIDeleteCommandResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h index 24bf5878ff..66a73e3074 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_request.h @@ -49,7 +49,7 @@ class UIDeleteSubmenuRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIDeleteSubmenuRequest(const MessageSharedPtr& message); + explicit UIDeleteSubmenuRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIDeleteSubmenuRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h index 05d77c82d7..85225d32bd 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_delete_submenu_response.h @@ -49,7 +49,7 @@ class UIDeleteSubmenuResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIDeleteSubmenuResponse(const MessageSharedPtr& message); + explicit UIDeleteSubmenuResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIDeleteSubmenuResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h index 06637fc8d4..e60e12be4f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_request.h @@ -50,7 +50,7 @@ class UIEndAudioPassThruRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIEndAudioPassThruRequest(const MessageSharedPtr& message); + explicit UIEndAudioPassThruRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIEndAudioPassThruRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h index 6d5594f69f..fa0732f738 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_end_audio_pass_thru_response.h @@ -49,7 +49,7 @@ class UIEndAudioPassThruResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIEndAudioPassThruResponse(const MessageSharedPtr& message); + explicit UIEndAudioPassThruResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIEndAudioPassThruResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h index ad9a566078..b2053585a3 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_request.h @@ -49,7 +49,7 @@ class UIGetCapabilitiesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIGetCapabilitiesRequest(const MessageSharedPtr& message); + explicit UIGetCapabilitiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIGetCapabilitiesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h index ce6ad6f7ef..2a28f9492b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_capabilities_response.h @@ -49,7 +49,7 @@ class UIGetCapabilitiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIGetCapabilitiesResponse(const MessageSharedPtr& message); + explicit UIGetCapabilitiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIGetCapabilitiesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h index 7371cd1031..713e560465 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_request.h @@ -49,7 +49,7 @@ class UIGetLanguageRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIGetLanguageRequest(const MessageSharedPtr& message); + explicit UIGetLanguageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIGetLanguageRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h index f6536452ce..2d85478750 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_language_response.h @@ -49,7 +49,7 @@ class UIGetLanguageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIGetLanguageResponse(const MessageSharedPtr& message); + explicit UIGetLanguageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIGetLanguageResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h index d0975e68da..e370a2f719 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_request.h @@ -49,7 +49,7 @@ class UIGetSupportedLanguagesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIGetSupportedLanguagesRequest(const MessageSharedPtr& message); + explicit UIGetSupportedLanguagesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIGetSupportedLanguagesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h index c888c7b208..6244a23066 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_get_supported_languages_response.h @@ -49,7 +49,7 @@ class UIGetSupportedLanguagesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIGetSupportedLanguagesResponse(const MessageSharedPtr& message); + explicit UIGetSupportedLanguagesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIGetSupportedLanguagesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h index 7cb4287244..9fe5c0f1b7 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_request.h @@ -49,7 +49,7 @@ class UIIsReadyRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIIsReadyRequest(const MessageSharedPtr& message); + explicit UIIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIIsReadyRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h index 64106654e9..c9ffb4a7c4 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_is_ready_response.h @@ -49,7 +49,7 @@ class UIIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIIsReadyResponse(const MessageSharedPtr& message); + explicit UIIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIIsReadyResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h index 69566324f2..7031cd2e2c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_request.h @@ -49,7 +49,7 @@ class UIPerformAudioPassThruRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIPerformAudioPassThruRequest(const MessageSharedPtr& message); + explicit UIPerformAudioPassThruRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIPerformAudioPassThruRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h index c3283101f9..6210108789 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_audio_pass_thru_response.h @@ -49,7 +49,7 @@ class UIPerformAudioPassThruResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIPerformAudioPassThruResponse(const MessageSharedPtr& message); + explicit UIPerformAudioPassThruResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIPerformAudioPassThruResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h index d8e2f6c682..ad1e7e2215 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_request.h @@ -49,7 +49,7 @@ class UIPerformInteractionRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIPerformInteractionRequest(const MessageSharedPtr& message); + explicit UIPerformInteractionRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIPerformInteractionRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h index 04286897a3..375ec79337 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_perform_interaction_response.h @@ -49,7 +49,7 @@ class UIPerformInteractionResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIPerformInteractionResponse(const MessageSharedPtr& message); + explicit UIPerformInteractionResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIPerformInteractionResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h index 06bfadbae7..f13899b3bb 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_request.h @@ -49,7 +49,7 @@ class UIScrollableMessageRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIScrollableMessageRequest(const MessageSharedPtr& message); + explicit UIScrollableMessageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIScrollableMessageRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h index 6d6d09c313..b1f8b31a3b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_scrollable_message_response.h @@ -49,7 +49,7 @@ class UIScrollableMessageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIScrollableMessageResponse(const MessageSharedPtr& message); + explicit UIScrollableMessageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIScrollableMessageResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_request.h index 96f91d0f82..32e6d71baa 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_request.h @@ -49,7 +49,7 @@ class UISetAppIconRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UISetAppIconRequest(const MessageSharedPtr& message); + explicit UISetAppIconRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UISetIconRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_response.h index b323a91c36..748ffa4774 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_app_icon_response.h @@ -49,7 +49,7 @@ class UISetAppIconResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UISetAppIconResponse(const MessageSharedPtr& message); + explicit UISetAppIconResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UISetIconResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_request.h index 7e67912f53..87cd13aa83 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_request.h @@ -48,7 +48,7 @@ class UiSetDisplayLayoutRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UiSetDisplayLayoutRequest(const MessageSharedPtr& message); + explicit UiSetDisplayLayoutRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UiSetDisplayLayoutRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h index 3e7a898af0..f8c9ccfbe4 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_display_layout_response.h @@ -49,7 +49,7 @@ class UiSetDisplayLayoutResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UiSetDisplayLayoutResponse(const MessageSharedPtr& message); + explicit UiSetDisplayLayoutResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UiSetDisplayLayoutResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h index 8b54e85332..5495df36f6 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_request.h @@ -49,7 +49,7 @@ class UISetGlobalPropertiesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UISetGlobalPropertiesRequest(const MessageSharedPtr& message); + explicit UISetGlobalPropertiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIShowRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h index b3cb38d49f..943f577ad9 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_global_properties_response.h @@ -49,7 +49,7 @@ class UISetGlobalPropertiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UISetGlobalPropertiesResponse(const MessageSharedPtr& message); + explicit UISetGlobalPropertiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UISetGlobalPropertiesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_request.h index 1541aada6b..779f74a506 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_request.h @@ -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 diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_response.h index f125f64282..7011915135 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_icon_response.h @@ -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 diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h index 443fc8d1a7..9ec6513dc9 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_request.h @@ -49,7 +49,7 @@ class UISetMediaClockTimerRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UISetMediaClockTimerRequest(const MessageSharedPtr& message); + explicit UISetMediaClockTimerRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UISetMediaClockTimerRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h index 9358707117..f8679cc089 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_set_media_clock_timer_response.h @@ -49,7 +49,7 @@ class UISetMediaClockTimerResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UISetMediaClockTimerResponse(const MessageSharedPtr& message); + explicit UISetMediaClockTimerResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UISetMediaClockTimerResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h index 136a99622b..d0a50a7b0c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_request.h @@ -49,7 +49,7 @@ class UIShowRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UIShowRequest(const MessageSharedPtr& message); + explicit UIShowRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIShowRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h index 4a9b49253e..07ae7e6efb 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_show_response.h @@ -49,7 +49,7 @@ class UIShowResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UIShowResponse(const MessageSharedPtr& message); + explicit UIShowResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UIShowResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h index 8a3b37bfef..0683a019fa 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_request.h @@ -49,7 +49,7 @@ class UISliderRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UISliderRequest(const MessageSharedPtr& message); + explicit UISliderRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UISliderRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h index 2384f248aa..0bc5deabf7 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/ui_slider_response.h @@ -49,7 +49,7 @@ class UISliderResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UISliderResponse(const MessageSharedPtr& message); + explicit UISliderResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UISliderResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h index b606134409..567441004b 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_request.h @@ -49,7 +49,7 @@ class UpdateAppListRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UpdateAppListRequest(const MessageSharedPtr& message); + explicit UpdateAppListRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UpdateAppListRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h index 135481cb0b..b0b57a7d1c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/update_app_list_response.h @@ -49,7 +49,7 @@ class UpdateAppListResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UpdateAppListResponse(const MessageSharedPtr& message); + explicit UpdateAppListResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UpdateAppListResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h index f645d312c5..4f8e82a0ab 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_request.h @@ -53,7 +53,7 @@ class UpdateDeviceListRequest : public RequestToHMI, * * @param message Incoming SmartObject message **/ - explicit UpdateDeviceListRequest(const MessageSharedPtr& message); + explicit UpdateDeviceListRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UpdateDeviceListRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h index 6ea2c1e528..e9aec76355 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/update_device_list_response.h @@ -49,7 +49,7 @@ class UpdateDeviceListResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UpdateDeviceListResponse(const MessageSharedPtr& message); + explicit UpdateDeviceListResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UpdateDeviceListResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h index f84f93f2ed..a415c51fcc 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_request.h @@ -34,6 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_UPDATE_SDL_REQUEST_H_ #include "application_manager/commands/hmi/request_to_hmi.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -49,7 +50,7 @@ class UpdateSDLRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit UpdateSDLRequest(const MessageSharedPtr& message); + explicit UpdateSDLRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UpdateSDLRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h index b0d370ecfd..cce0c7f681 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/update_sdl_response.h @@ -49,7 +49,7 @@ class UpdateSDLResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit UpdateSDLResponse(const MessageSharedPtr& message); + explicit UpdateSDLResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief UpdateSDLResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h index c60533d2ea..8b8a2172ad 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_request.h @@ -49,7 +49,7 @@ class VIDiagnosticMessageRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VIDiagnosticMessageRequest(const MessageSharedPtr& message); + explicit VIDiagnosticMessageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VIDiagnosticMessageRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h index 027e007e42..9c192054f3 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_diagnostic_message_response.h @@ -49,7 +49,7 @@ class VIDiagnosticMessageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VIDiagnosticMessageResponse(const MessageSharedPtr& message); + explicit VIDiagnosticMessageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VIDiagnosticMessageResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h index 170eb895fd..06faa2bc7f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_request.h @@ -49,7 +49,7 @@ class VIGetDTCsRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VIGetDTCsRequest(const MessageSharedPtr& message); + explicit VIGetDTCsRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VIGetDTCsRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h index 3ba4656d5b..a77984ea1a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_dtcs_response.h @@ -49,7 +49,7 @@ class VIGetDTCsResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VIGetDTCsResponse(const MessageSharedPtr& message); + explicit VIGetDTCsResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VIGetDTCsResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h index 7413b6bf3b..a4e6525baf 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request.h @@ -49,7 +49,7 @@ class VIGetVehicleDataRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VIGetVehicleDataRequest(const MessageSharedPtr& message); + explicit VIGetVehicleDataRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VIGetVehicleDataRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h index 5a39891839..ff69152a16 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_request_template.h @@ -52,8 +52,8 @@ class VIGetVehicleDataRequestTemplate : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VIGetVehicleDataRequestTemplate(const MessageSharedPtr& message) - : RequestToHMI(message) { + explicit VIGetVehicleDataRequestTemplate(const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } /** diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h index 1f9736b56a..488f1e50ec 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response.h @@ -34,6 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_GET_VEHICLE_DATA_RESPONSE_H_ #include "application_manager/commands/hmi/response_from_hmi.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -49,7 +50,7 @@ class VIGetVehicleDataResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VIGetVehicleDataResponse(const MessageSharedPtr& message); + explicit VIGetVehicleDataResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VIGetVehicleDataResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h index 9942110ca8..25581efa01 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_data_response_template.h @@ -35,6 +35,7 @@ #include "application_manager/event_engine/event.h" #include "application_manager/commands/hmi/response_from_hmi.h" +#include "application_manager/application_manager.h" namespace application_manager { namespace commands { @@ -50,8 +51,8 @@ class VIGetVehicleDataResponseTemplate : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VIGetVehicleDataResponseTemplate(const MessageSharedPtr& message) - : ResponseFromHMI(message) { + explicit VIGetVehicleDataResponseTemplate(const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } /** @@ -61,7 +62,7 @@ class VIGetVehicleDataResponseTemplate : public ResponseFromHMI { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(eventID); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } private: diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h index 67d8ae046c..14b2f27c42 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_request.h @@ -49,7 +49,7 @@ class VIGetVehicleTypeRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VIGetVehicleTypeRequest(const MessageSharedPtr& message); + explicit VIGetVehicleTypeRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VIGetVehicleTypeRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h index b36b193418..83b108418e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_get_vehicle_type_response.h @@ -49,7 +49,7 @@ class VIGetVehicleTypeResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VIGetVehicleTypeResponse(const MessageSharedPtr& message); + explicit VIGetVehicleTypeResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VIGetVehicleTypeResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h index 061681029a..6c24332002 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_request.h @@ -49,7 +49,7 @@ class VIIsReadyRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VIIsReadyRequest(const MessageSharedPtr& message); + explicit VIIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VIIsReadyRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h index 52e00f85da..4abbf1466c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_is_ready_response.h @@ -34,6 +34,7 @@ #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_VI_IS_READY_RESPONSE_H_ #include "application_manager/commands/hmi/response_from_hmi.h" +#include "application_manager/application_manager.h" namespace application_manager { @@ -49,7 +50,7 @@ class VIIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VIIsReadyResponse(const MessageSharedPtr& message); + explicit VIIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VIIsReadyResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h index 6520db5e7d..c2911e9bd5 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_request.h @@ -49,7 +49,7 @@ class VIReadDIDRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VIReadDIDRequest(const MessageSharedPtr& message); + explicit VIReadDIDRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VIReadDIDRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h index 0855be454b..893fb69e71 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_read_did_response.h @@ -49,7 +49,7 @@ class VIReadDIDResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VIReadDIDResponse(const MessageSharedPtr& message); + explicit VIReadDIDResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VIReadDIDResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h index 1eb06c6217..8cef8ea6f6 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request.h @@ -49,7 +49,7 @@ class VISubscribeVehicleDataRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VISubscribeVehicleDataRequest(const MessageSharedPtr& message); + explicit VISubscribeVehicleDataRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VISubscribeVehicleDataRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h index 5cf16c3610..7514819f81 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_request_template.h @@ -53,8 +53,8 @@ class VISubscribeVehicleDataRequestTemplate : public RequestToHMI { * @param message Incoming SmartObject message **/ explicit VISubscribeVehicleDataRequestTemplate( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } /** diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h index b5e2788f32..f79faa6de2 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response.h @@ -49,7 +49,7 @@ class VISubscribeVehicleDataResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VISubscribeVehicleDataResponse(const MessageSharedPtr& message); + explicit VISubscribeVehicleDataResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VISubscribeVehicleDataResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h index be67ab0106..b49c6628a5 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_subscribe_vehicle_data_response_template.h @@ -35,6 +35,7 @@ #include "application_manager/event_engine/event.h" #include "application_manager/commands/hmi/response_from_hmi.h" +#include "application_manager/application_manager.h" namespace application_manager { namespace commands { @@ -50,8 +51,8 @@ class VISubscribeVehicleDataResponseTemplate : public ResponseFromHMI { * @param message Incoming SmartObject message **/ explicit VISubscribeVehicleDataResponseTemplate( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } /** @@ -61,7 +62,7 @@ class VISubscribeVehicleDataResponseTemplate : public ResponseFromHMI { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(eventID); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } private: DISALLOW_COPY_AND_ASSIGN(VISubscribeVehicleDataResponseTemplate<eventID>); diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h index 1320ae477a..e99473d0e0 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request.h @@ -49,7 +49,7 @@ class VIUnsubscribeVehicleDataRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VIUnsubscribeVehicleDataRequest(const MessageSharedPtr& message); + explicit VIUnsubscribeVehicleDataRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VIUnsubscribeVehicleDataRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h index 6014078ce3..ebe00194a9 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_request_template.h @@ -53,8 +53,8 @@ class VIUnsubscribeVehicleDataRequestTemplate : public RequestToHMI { * @param message Incoming SmartObject message **/ explicit VIUnsubscribeVehicleDataRequestTemplate( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } /** diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h index 8818709afe..a1389758f5 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response.h @@ -49,7 +49,7 @@ class VIUnsubscribeVehicleDataResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VIUnsubscribeVehicleDataResponse(const MessageSharedPtr& message); + explicit VIUnsubscribeVehicleDataResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VIUnsubscribeVehicleDataResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h index a74f71fdf2..aecd562aaa 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vi_unsubscribe_vehicle_data_response_template.h @@ -35,6 +35,7 @@ #include "application_manager/event_engine/event.h" #include "application_manager/commands/hmi/response_from_hmi.h" +#include "application_manager/application_manager.h" namespace application_manager { namespace commands { @@ -51,8 +52,8 @@ class VIUnsubscribeVehicleDataResponseTemplate : public ResponseFromHMI { * @param message Incoming SmartObject message **/ explicit VIUnsubscribeVehicleDataResponseTemplate( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } /** @@ -62,7 +63,7 @@ class VIUnsubscribeVehicleDataResponseTemplate : public ResponseFromHMI { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(eventID); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } private: DISALLOW_COPY_AND_ASSIGN(VIUnsubscribeVehicleDataResponseTemplate<eventID>); diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h index 9fdc3f776f..1abea1b25a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_request.h @@ -49,7 +49,7 @@ class VRAddCommandRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VRAddCommandRequest(const MessageSharedPtr& message); + explicit VRAddCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRAddCommandRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h index 7418ed5865..77bc593a3a 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_add_command_response.h @@ -49,7 +49,7 @@ class VRAddCommandResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VRAddCommandResponse(const MessageSharedPtr& message); + explicit VRAddCommandResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRAddCommandResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h index 53584ee970..43a05cf3b9 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_request.h @@ -49,7 +49,7 @@ class VRChangeRegistrationRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VRChangeRegistrationRequest(const MessageSharedPtr& message); + explicit VRChangeRegistrationRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRChangeRegistrationRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h index d71a14da34..61993b93c4 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_change_registration_response.h @@ -49,7 +49,7 @@ class VRChangeRegistrationResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VRChangeRegistrationResponse(const MessageSharedPtr& message); + explicit VRChangeRegistrationResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRChangeRegistrationResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h index 91a5dc7d99..e6eb3d4005 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_request.h @@ -49,7 +49,7 @@ class VRDeleteCommandRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VRDeleteCommandRequest(const MessageSharedPtr& message); + explicit VRDeleteCommandRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRDeleteCommandRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h index ad8c82e38c..0f91738ddd 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_delete_command_response.h @@ -49,7 +49,7 @@ class VRDeleteCommandResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VRDeleteCommandResponse(const MessageSharedPtr& message); + explicit VRDeleteCommandResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRDeleteCommandResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h index 676967083f..c4c361643c 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_request.h @@ -49,7 +49,7 @@ class VRGetCapabilitiesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VRGetCapabilitiesRequest(const MessageSharedPtr& message); + explicit VRGetCapabilitiesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRGetCapabilitiesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h index 8b88eb4e3b..d9ce78b251 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_capabilities_response.h @@ -49,7 +49,7 @@ class VRGetCapabilitiesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VRGetCapabilitiesResponse(const MessageSharedPtr& message); + explicit VRGetCapabilitiesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRGetCapabilitiesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h index 9dd9133ffd..1ef46f6c08 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_request.h @@ -49,7 +49,7 @@ class VRGetLanguageRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VRGetLanguageRequest(const MessageSharedPtr& message); + explicit VRGetLanguageRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRGetLanguageRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h index d9c4fc2126..28776f1259 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_language_response.h @@ -49,7 +49,7 @@ class VRGetLanguageResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VRGetLanguageResponse(const MessageSharedPtr& message); + explicit VRGetLanguageResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRGetLanguageResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h index 0a010cdfec..6f0803c2f9 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_request.h @@ -49,7 +49,7 @@ class VRGetSupportedLanguagesRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VRGetSupportedLanguagesRequest(const MessageSharedPtr& message); + explicit VRGetSupportedLanguagesRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRGetSupportedLanguagesRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h index dbbe57ba36..85b9a1a3ad 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_get_supported_languages_response.h @@ -49,7 +49,7 @@ class VRGetSupportedLanguagesResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VRGetSupportedLanguagesResponse(const MessageSharedPtr& message); + explicit VRGetSupportedLanguagesResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRGetSupportedLanguagesResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h index e66c9c36a5..2877aef65f 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_request.h @@ -49,7 +49,7 @@ class VRIsReadyRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VRIsReadyRequest(const MessageSharedPtr& message); + explicit VRIsReadyRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRIsReadyRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h index a9b1a68455..08fc099c39 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_is_ready_response.h @@ -49,7 +49,7 @@ class VRIsReadyResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VRIsReadyResponse(const MessageSharedPtr& message); + explicit VRIsReadyResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRIsReadyResponse class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h index b819fdb927..50616ef0bf 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_request.h @@ -49,7 +49,7 @@ class VRPerformInteractionRequest : public RequestToHMI { * * @param message Incoming SmartObject message **/ - explicit VRPerformInteractionRequest(const MessageSharedPtr& message); + explicit VRPerformInteractionRequest(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief VRPerformInteractionRequest class destructor diff --git a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h index ffbbd613e2..6cd3bd7b73 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/vr_perform_interaction_response.h @@ -49,7 +49,7 @@ class VRPerformInteractionResponse : public ResponseFromHMI { * * @param message Incoming SmartObject message **/ - explicit VRPerformInteractionResponse(const MessageSharedPtr& message); + explicit VRPerformInteractionResponse(const MessageSharedPtr& message, ApplicationManager& application_manager); /** * @brief TTSPerformInteractionResponse class destructor 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..09d4ae9002 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,7 +31,7 @@ */ #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 { @@ -39,7 +39,7 @@ namespace application_manager { namespace commands { ActivateAppRequest::ActivateAppRequest( - const MessageSharedPtr& message): RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager): RequestToHMI(message, application_manager) { } @@ -50,7 +50,7 @@ namespace application_manager { 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); + application_manager_.set_application_id(correlation_id(), app_id); #ifdef ENABLE_LOG if ((*message_)[strings::msg_params].keyExists( strings::activate_app_hmi_level)) { 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..a667c20190 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,7 +38,7 @@ namespace application_manager { namespace commands { ActivateAppResponse::ActivateAppResponse( - const MessageSharedPtr& message): ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager): ResponseFromHMI(message, application_manager) { } ActivateAppResponse::~ActivateAppResponse() { @@ -48,7 +48,7 @@ void ActivateAppResponse::Run() { LOG4CXX_TRACE(logger_, "enter"); 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 024ff86b6e..9d0cd89212 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 @@ -31,7 +31,7 @@ */ #include "application_manager/commands/hmi/add_statistics_info_notification.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/policies/policy_handler.h" #include "interfaces/HMI_API.h" namespace application_manager { @@ -39,8 +39,8 @@ namespace application_manager { namespace commands { AddStatisticsInfoNotification::AddStatisticsInfoNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } AddStatisticsInfoNotification::~AddStatisticsInfoNotification() { @@ -52,7 +52,7 @@ void AddStatisticsInfoNotification::Run() { int type = (*message_)[strings::msg_params][hmi_notification::statistic_type] .asInt(); - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().AddStatisticsInfo(type); + application_manager_.GetPolicyHandler().AddStatisticsInfo(type); } } // namespace commands 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..768c8b7653 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,8 +36,8 @@ 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() { 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..cc8248483a 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,14 +30,14 @@ * 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() { @@ -46,7 +46,7 @@ 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..5a66e697a9 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,8 +36,8 @@ 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() { 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..a2c7d8fc78 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,7 +30,7 @@ * 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 { @@ -38,7 +38,7 @@ namespace application_manager { namespace commands { AllowAppResponse::AllowAppResponse( - const MessageSharedPtr& message): ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager): ResponseFromHMI(message, application_manager) { } AllowAppResponse::~AllowAppResponse() { @@ -50,7 +50,7 @@ void AllowAppResponse::Run() { uint32_t connection_key = (*message_)[strings::params][strings::connection_key].asInt(); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()-> + ApplicationSharedPtr app = application_manager_. application(connection_key); if (!app) { 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..1e27e01487 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,14 +31,14 @@ */ #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() { 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..b33f607310 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,7 +39,7 @@ namespace application_manager { namespace commands { BasicCommunicationSystemResponse::BasicCommunicationSystemResponse( - const MessageSharedPtr& message): ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager): ResponseFromHMI(message, application_manager) { } BasicCommunicationSystemResponse::~BasicCommunicationSystemResponse() { @@ -48,7 +49,7 @@ void BasicCommunicationSystemResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); 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..622323a6e9 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,8 +38,8 @@ namespace application_manager { namespace commands { ButtonGetCapabilitiesRequest::ButtonGetCapabilitiesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } ButtonGetCapabilitiesRequest::~ButtonGetCapabilitiesRequest() { 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..711040ff60 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,8 +38,8 @@ namespace application_manager { namespace commands { ButtonGetCapabilitiesResponse::ButtonGetCapabilitiesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } ButtonGetCapabilitiesResponse::~ButtonGetCapabilitiesResponse() { @@ -57,7 +57,7 @@ void ButtonGetCapabilitiesResponse::Run() { } HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->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..d366aa408b 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,8 +36,8 @@ 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() { 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..f3dd63becd 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,8 +35,8 @@ 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() { 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 b0a30cca26..8297e56a71 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 @@ -38,8 +38,8 @@ 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() { 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 22b61659bd..ab54651552 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 @@ -31,14 +31,15 @@ */ #include "application_manager/commands/hmi/dial_number_response.h" + namespace application_manager { 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() { @@ -47,7 +48,7 @@ DialNumberResponse::~DialNumberResponse() { void DialNumberResponse::Run() { event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_DialNumber); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace hmi 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..c7004ec436 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,14 +31,14 @@ */ #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() { @@ -48,7 +48,7 @@ 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(); } 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 186813ac41..93b108e04d 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,22 +30,19 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/get_system_info_response.h" -#include "application_manager/application_manager_impl.h" #include "application_manager/message_helper.h" namespace application_manager { namespace commands { -GetSystemInfoResponse::GetSystemInfoResponse(const MessageSharedPtr& message) - : ResponseFromHMI(message) {} +GetSystemInfoResponse::GetSystemInfoResponse( + const MessageSharedPtr& message, ApplicationManager& application_manager): ResponseFromHMI(message, application_manager) { +} GetSystemInfoResponse::~GetSystemInfoResponse() {} void GetSystemInfoResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager::ApplicationManagerImpl* app_manager_inst = - application_manager::ApplicationManagerImpl::instance(); - const hmi_apis::Common_Result::eType code = static_cast<hmi_apis::Common_Result::eType>( (*message_)[strings::params][hmi_response::code].asInt()); @@ -54,7 +51,7 @@ void GetSystemInfoResponse::Run() { // We have to set preloaded flag as false in policy table on any response // of GetSystemInfo (SDLAQ-CRS-2365) - app_manager_inst->GetPolicyHandler().OnGetSystemInfo( + application_manager_.GetPolicyHandler().OnGetSystemInfo( info.ccpu_version, info.wers_country_code, info.language); } @@ -76,9 +73,7 @@ const SystemInfo GetSystemInfoResponse::GetSystemInfo( info.language = application_manager::MessageHelper::CommonLanguageToString( static_cast<hmi_apis::Common_Language::eType>(lang_code)); - application_manager::ApplicationManagerImpl::instance() - ->hmi_capabilities() - .set_ccpu_version(info.ccpu_version); + application_manager_.hmi_capabilities().set_ccpu_version(info.ccpu_version); return info; } 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 831c8118ec..ee831104ce 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,14 @@ #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 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() { @@ -48,9 +49,9 @@ void GetUrls::Run() { LOG4CXX_AUTO_TRACE(logger_); smart_objects::SmartObject& object = *message_; object[strings::params][strings::message_type] = MessageType::kResponse; - if (application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().PolicyEnabled()) { + if (application_manager_.GetPolicyHandler().PolicyEnabled()) { policy::EndpointUrls endpoints; - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().GetServiceUrls( + application_manager_.GetPolicyHandler().GetServiceUrls( object[strings::msg_params][hmi_request::service].asString(), endpoints); if (!endpoints.empty()) { object[strings::msg_params].erase(hmi_request::service); @@ -88,7 +89,7 @@ void GetUrls::Run() { object[strings::params][hmi_response::code] = hmi_apis::Common_Result::DATA_NOT_AVAILABLE; } - 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..4b8ebde050 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,13 +31,13 @@ */ #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) { + const MessageSharedPtr& message, ApplicationManager& application_manager): ResponseToHMI(message, application_manager) { } GetUrlsResponse::~GetUrlsResponse() { @@ -48,7 +48,7 @@ void GetUrlsResponse::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 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..194b6e9d28 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,7 +37,7 @@ namespace application_manager { namespace commands { MixingAudioSupportedRequest::MixingAudioSupportedRequest( - const MessageSharedPtr& message) : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : RequestToHMI(message, application_manager) { } MixingAudioSupportedRequest::~MixingAudioSupportedRequest() { 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..a9da74170c 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,14 +30,14 @@ * 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() { @@ -47,7 +47,7 @@ void MixingAudioSupportedResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + application_manager_.hmi_capabilities(); hmi_capabilities.set_attenuated_supported((*message_) [strings::msg_params][hmi_response::attenuated_supported].asBool()); } 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..e431cb6376 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,7 +37,7 @@ namespace application_manager { namespace commands { NaviAlertManeuverRequest::NaviAlertManeuverRequest( - const MessageSharedPtr& message) : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : RequestToHMI(message, application_manager) { } NaviAlertManeuverRequest::~NaviAlertManeuverRequest() { 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..d8e3807eb9 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,7 +39,7 @@ namespace application_manager { namespace commands { NaviAlertManeuverResponse::NaviAlertManeuverResponse( - const MessageSharedPtr& message) : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) { } NaviAlertManeuverResponse::~NaviAlertManeuverResponse() { @@ -49,7 +50,7 @@ void NaviAlertManeuverResponse::Run() { 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 314624b60c..25ef2a24d1 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,21 +31,23 @@ */ #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), + 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_ @@ -62,7 +64,7 @@ void AudioStartStreamRequest::Run() { subscribe_on_event(hmi_apis::FunctionID::Navigation_StartAudioStream, correlation_id()); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()-> + ApplicationSharedPtr app = application_manager_. application_by_hmi_app(application_id()); if (app) { app->set_audio_streaming_allowed(true); @@ -77,7 +79,7 @@ void AudioStartStreamRequest::on_event(const event_engine::Event& event) { using namespace protocol_handler; LOG4CXX_AUTO_TRACE(logger_); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()-> + ApplicationSharedPtr app = application_manager_. application_by_hmi_app(application_id()); if (!app) { LOG4CXX_ERROR(logger_, @@ -96,7 +98,7 @@ void AudioStartStreamRequest::on_event(const event_engine::Event& event) { if (hmi_apis::Common_Result::SUCCESS == code) { LOG4CXX_INFO(logger_, "StartAudioStream response SUCCESS"); - if (ApplicationManagerImpl::instance()-> + if (application_manager_. HMILevelAllowsStreaming(app->app_id(), ServiceType::kAudio)) { app->set_audio_streaming_approved(true); } else { @@ -121,14 +123,14 @@ void AudioStartStreamRequest::on_event(const event_engine::Event& event) { void AudioStartStreamRequest::onTimeOut() { RetryStartSession(); - ApplicationManagerImpl::instance()->TerminateRequest( + application_manager_.TerminateRequest( connection_key(), correlation_id()); } void AudioStartStreamRequest::RetryStartSession() { LOG4CXX_AUTO_TRACE(logger_); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()-> + ApplicationSharedPtr app = application_manager_. application_by_hmi_app(application_id()); if (!app) { LOG4CXX_ERROR(logger_, @@ -152,13 +154,13 @@ void AudioStartStreamRequest::RetryStartSession() { if (curr_retry_number < retry_number_ - 1) { LOG4CXX_DEBUG(logger_, "Send AudioStartStream retry. retry_number = " << curr_retry_number); - MessageHelper::SendAudioStartStream(app->app_id()); + 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."); - ApplicationManagerImpl::instance()->EndNaviServices(app->app_id()); + application_manager_.EndNaviServices(app->app_id()); } } 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..5e3098d1c4 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 @@ -31,12 +31,13 @@ */ #include "application_manager/commands/hmi/navi_audio_start_stream_response.h" + 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() { @@ -47,7 +48,7 @@ void AudioStartStreamResponse::Run() { 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..fac42d66f0 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,8 +36,8 @@ namespace application_manager { namespace commands { AudioStopStreamRequest::AudioStopStreamRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } AudioStopStreamRequest::~AudioStopStreamRequest() { 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..7f7d3cbfa3 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,8 +35,8 @@ 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() { diff --git a/src/components/application_manager/src/commands/hmi/navi_get_way_points_request.cc b/src/components/application_manager/src/commands/hmi/navi_get_way_points_request.cc index 2776b120e0..51f862c957 100644 --- a/src/components/application_manager/src/commands/hmi/navi_get_way_points_request.cc +++ b/src/components/application_manager/src/commands/hmi/navi_get_way_points_request.cc @@ -37,8 +37,8 @@ namespace application_manager { namespace commands { NaviGetWayPointsRequest::NaviGetWayPointsRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) {} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} NaviGetWayPointsRequest::~NaviGetWayPointsRequest() {} diff --git a/src/components/application_manager/src/commands/hmi/navi_get_way_points_response.cc b/src/components/application_manager/src/commands/hmi/navi_get_way_points_response.cc index 2e1427f865..0b449d9ac5 100644 --- a/src/components/application_manager/src/commands/hmi/navi_get_way_points_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_get_way_points_response.cc @@ -39,8 +39,8 @@ namespace application_manager { namespace commands { NaviGetWayPointsResponse::NaviGetWayPointsResponse( - const MessageSharedPtr &message) - : ResponseFromHMI(message) {} + const MessageSharedPtr &message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} NaviGetWayPointsResponse::~NaviGetWayPointsResponse() {} @@ -50,7 +50,7 @@ void NaviGetWayPointsResponse::Run() { 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..d48a204008 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,8 +36,8 @@ 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() { 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..2b4a838ebe 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,14 +30,14 @@ * 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() { @@ -53,7 +53,7 @@ void NaviIsReadyResponse::Run() { } HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->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..2b9ffe1bcf 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,8 +36,8 @@ 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() { 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..2126dd5a99 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 @@ -32,12 +32,13 @@ #include "application_manager/commands/hmi/navi_send_location_response.h" #include "application_manager/event_engine/event.h" + 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() { @@ -48,7 +49,7 @@ void NaviSendLocationResponse::Run() { 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..551220a832 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,7 +37,7 @@ namespace application_manager { namespace commands { NaviShowConstantTBTRequest::NaviShowConstantTBTRequest( - const MessageSharedPtr& message) : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : RequestToHMI(message, application_manager) { } NaviShowConstantTBTRequest::~NaviShowConstantTBTRequest() { 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..221403bf6c 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,7 +39,7 @@ namespace application_manager { namespace commands { NaviShowConstantTBTResponse::NaviShowConstantTBTResponse( - const MessageSharedPtr& message) : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) { } NaviShowConstantTBTResponse::~NaviShowConstantTBTResponse() { @@ -49,7 +50,7 @@ void NaviShowConstantTBTResponse::Run() { 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 a839ee5275..71a129c2d7 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,21 +31,23 @@ */ #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), + 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_ @@ -62,7 +64,7 @@ void NaviStartStreamRequest::Run() { subscribe_on_event(hmi_apis::FunctionID::Navigation_StartStream, correlation_id()); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()-> + ApplicationSharedPtr app = application_manager_. application_by_hmi_app(application_id()); if (app) { app->set_video_streaming_allowed(true); @@ -77,7 +79,7 @@ void NaviStartStreamRequest::on_event(const event_engine::Event& event) { using namespace protocol_handler; LOG4CXX_AUTO_TRACE(logger_); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()-> + ApplicationSharedPtr app = application_manager_. application_by_hmi_app(application_id()); if (!app) { LOG4CXX_ERROR(logger_, @@ -96,7 +98,7 @@ void NaviStartStreamRequest::on_event(const event_engine::Event& event) { if (hmi_apis::Common_Result::SUCCESS == code) { LOG4CXX_INFO(logger_, "NaviStartStreamResponse SUCCESS"); - if (ApplicationManagerImpl::instance()-> + if (application_manager_. HMILevelAllowsStreaming(app->app_id(), ServiceType::kMobileNav)) { app->set_video_streaming_approved(true); } else { @@ -121,14 +123,14 @@ void NaviStartStreamRequest::on_event(const event_engine::Event& event) { void NaviStartStreamRequest::onTimeOut() { RetryStartSession(); - ApplicationManagerImpl::instance()->TerminateRequest( + application_manager_.TerminateRequest( connection_key(), correlation_id()); } void NaviStartStreamRequest::RetryStartSession() { LOG4CXX_AUTO_TRACE(logger_); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()-> + ApplicationSharedPtr app = application_manager_. application_by_hmi_app(application_id()); if (!app) { LOG4CXX_ERROR(logger_, @@ -152,13 +154,13 @@ void NaviStartStreamRequest::RetryStartSession() { if (curr_retry_number < retry_number_ - 1) { LOG4CXX_DEBUG(logger_, "Send NaviStartStream retry. retry_number = " << curr_retry_number); - MessageHelper::SendNaviStartStream(app->app_id()); + 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"); - ApplicationManagerImpl::instance()->EndNaviServices(app->app_id()); + 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..02efc77e1e 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 @@ -31,12 +31,13 @@ */ #include "application_manager/commands/hmi/navi_start_stream_response.h" + 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() { @@ -47,7 +48,7 @@ void NaviStartStreamResponse::Run() { 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..0c72f24845 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,8 +5,8 @@ namespace application_manager { namespace commands { NaviStopStreamRequest::NaviStopStreamRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } NaviStopStreamRequest::~NaviStopStreamRequest() { 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..a10eb5d325 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,8 +35,8 @@ 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() { 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 index 9b98aaec43..f2106c8724 100644 --- 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 @@ -37,8 +37,8 @@ namespace application_manager { namespace commands { NaviSubscribeWayPointsRequest::NaviSubscribeWayPointsRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) {} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} NaviSubscribeWayPointsRequest::~NaviSubscribeWayPointsRequest() {} diff --git a/src/components/application_manager/src/commands/hmi/navi_subscribe_way_points_response.cc b/src/components/application_manager/src/commands/hmi/navi_subscribe_way_points_response.cc index 50e7f3a04b..0f5ebfb1a2 100644 --- a/src/components/application_manager/src/commands/hmi/navi_subscribe_way_points_response.cc +++ b/src/components/application_manager/src/commands/hmi/navi_subscribe_way_points_response.cc @@ -39,8 +39,8 @@ namespace application_manager { namespace commands { NaviSubscribeWayPointsResponse::NaviSubscribeWayPointsResponse( - const MessageSharedPtr &message) - : ResponseFromHMI(message) {} + const MessageSharedPtr &message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} NaviSubscribeWayPointsResponse::~NaviSubscribeWayPointsResponse() {} @@ -50,7 +50,7 @@ void NaviSubscribeWayPointsResponse::Run() { event_engine::Event event( hmi_apis::FunctionID::Navigation_SubscribeWayPoints); 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_unsubscribe_way_points_request.cc b/src/components/application_manager/src/commands/hmi/navi_unsubscribe_way_points_request.cc index d6c3e008b1..e66069feef 100644 --- 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 @@ -37,8 +37,8 @@ namespace application_manager { namespace commands { NaviUnSubscribeWayPointsRequest::NaviUnSubscribeWayPointsRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) {} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) {} NaviUnSubscribeWayPointsRequest::~NaviUnSubscribeWayPointsRequest() {} 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 index a39b8a3a68..a0c82135d9 100644 --- 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 @@ -40,8 +40,8 @@ namespace application_manager { namespace commands { NaviUnsubscribeWayPointsResponse::NaviUnsubscribeWayPointsResponse( - const MessageSharedPtr &message) - : ResponseFromHMI(message) {} + const MessageSharedPtr &message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) {} NaviUnsubscribeWayPointsResponse::~NaviUnsubscribeWayPointsResponse() {} @@ -51,7 +51,7 @@ void NaviUnsubscribeWayPointsResponse::Run() { event_engine::Event event( hmi_apis::FunctionID::Navigation_UnsubscribeWayPoints); 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_update_turn_list_request.cc b/src/components/application_manager/src/commands/hmi/navi_update_turn_list_request.cc index 37037245fa..dd0e8a78f4 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,7 +37,7 @@ namespace application_manager { namespace commands { NaviUpdateTurnListRequest::NaviUpdateTurnListRequest( - const MessageSharedPtr& message) : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : RequestToHMI(message, application_manager) { } NaviUpdateTurnListRequest::~NaviUpdateTurnListRequest() { 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..c932e6756d 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,7 +39,7 @@ namespace application_manager { namespace commands { NaviUpdateTurnListResponse::NaviUpdateTurnListResponse( - const MessageSharedPtr& message) : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : ResponseFromHMI(message, application_manager) { } NaviUpdateTurnListResponse::~NaviUpdateTurnListResponse() { @@ -49,7 +50,7 @@ void NaviUpdateTurnListResponse::Run() { 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..831d0dcc89 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,18 +31,18 @@ */ #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() { @@ -64,7 +64,7 @@ void NotificationFromHMI::SendNotificationToMobile( (*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( @@ -78,8 +78,7 @@ 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 +93,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..635b0c8ac0 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,17 +31,17 @@ */ #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() { @@ -61,7 +61,7 @@ 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 dcc7fdc3d7..28e185d9da 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,15 +31,17 @@ */ #include "application_manager/commands/hmi/on_allow_sdl_functionality_notification.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" +#include "application_manager/policies/policy_handler.h" namespace application_manager { namespace commands { OnAllowSDLFunctionalityNotification::OnAllowSDLFunctionalityNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) {} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { +} OnAllowSDLFunctionalityNotification::~OnAllowSDLFunctionalityNotification() {} @@ -47,9 +49,10 @@ void OnAllowSDLFunctionalityNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); std::string device_id; if ((*message_)[strings::msg_params].keyExists("device")) { - device_id = (*message_)[strings::msg_params]["device"]["id"].asString(); + device_id = (*message_)[strings::msg_params]["device"]["id"] + .asString(); } - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().OnAllowSDLFunctionalityNotification( + application_manager_.GetPolicyHandler().OnAllowSDLFunctionalityNotification( (*message_)[strings::msg_params][hmi_response::allowed].asBool(), device_id); } 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 acdcc5da9f..fdbb6169ca 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,8 +40,8 @@ namespace application_manager { namespace commands { OnAppActivatedNotification::OnAppActivatedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnAppActivatedNotification::~OnAppActivatedNotification() { @@ -51,7 +51,7 @@ void OnAppActivatedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_OnAppActivated); 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/on_app_deactivated_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_deactivated_notification.cc index 899c29b369..e3ee21c77e 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,8 +42,8 @@ namespace application_manager { namespace commands { OnAppDeactivatedNotification::OnAppDeactivatedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnAppDeactivatedNotification::~OnAppDeactivatedNotification() { @@ -53,7 +53,7 @@ void OnAppDeactivatedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_OnAppDeactivated); 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/on_app_permission_changed_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_permission_changed_notification.cc index c786b486f4..a5f4ced9a5 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,8 +37,8 @@ namespace application_manager { namespace commands { OnAppPermissionChangedNotification::OnAppPermissionChangedNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) { } OnAppPermissionChangedNotification::~OnAppPermissionChangedNotification() { 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 1503b6c98c..7cc5133ba2 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,18 +32,20 @@ */ #include "application_manager/commands/hmi/on_app_permission_consent_notification.h" -#include "application_manager/application_manager_impl.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_); @@ -79,9 +81,10 @@ void OnAppPermissionConsentNotification::Run() { permission_consent.group_permissions.push_back(permissions); } - permission_consent.consent_source = msg_params["source"].asString(); + permission_consent.consent_source = + msg_params["source"].asString(); - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().OnAppPermissionConsent(connection_key, + 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..944917d90b 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,14 +31,14 @@ */ #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() { @@ -51,7 +51,7 @@ void OnAppRegisteredNotification::Run() { SendNotification(); event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_OnAppRegistered); 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/on_app_unregistered_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_unregistered_notification.cc index 571c6f381c..1b22a3ec38 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,7 +39,7 @@ namespace application_manager { namespace commands { OnAppUnregisteredNotification::OnAppUnregisteredNotification( - const MessageSharedPtr& message) : NotificationToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) { } OnAppUnregisteredNotification::~OnAppUnregisteredNotification() { @@ -51,7 +51,7 @@ void OnAppUnregisteredNotification::Run() { //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(); } 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..76cf3c9199 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,8 +37,8 @@ namespace application_manager { namespace commands { OnAudioDataStreamingNotification::OnAudioDataStreamingNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) { } OnAudioDataStreamingNotification::~OnAudioDataStreamingNotification() { 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..c82529b0b8 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,7 +42,7 @@ namespace commands { namespace hmi { OnButtonEventNotification::OnButtonEventNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) { } void OnButtonEventNotification::Run() { 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..567b243638 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_); 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..a8e8968e20 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,7 +39,7 @@ namespace commands { namespace hmi { OnButtonSubscriptionNotification::OnButtonSubscriptionNotification( - const MessageSharedPtr& message) : NotificationToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) { } OnButtonSubscriptionNotification::~OnButtonSubscriptionNotification() { 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 fbd866927b..d541360148 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,23 +31,24 @@ */ #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()); } 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 66e20151d1..5247c0686e 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,7 +32,7 @@ #include <algorithm> #include "application_manager/commands/hmi/on_device_state_changed_notification.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" #include "application_manager/message_helper.h" #include "interfaces/HMI_API.h" #include "encryption/hashing.h" @@ -79,8 +79,9 @@ namespace application_manager { namespace commands { OnDeviceStateChangedNotification::OnDeviceStateChangedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) {} + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { +} OnDeviceStateChangedNotification::~OnDeviceStateChangedNotification() {} @@ -106,7 +107,7 @@ void OnDeviceStateChangedNotification::Run() { device_id = encryption::MakeHash(bt_mac); LOG4CXX_DEBUG(logger_, "Device_id hashed as BT MAC : " << device_id); } - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().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 96bbf5e17a..c5bf69afae 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,18 +44,21 @@ 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(); @@ -71,15 +74,15 @@ void OnDriverDistractionNotification::Run() { (*on_driver_distraction)[strings::msg_params][mobile_notification::state] = state; - ApplicationManagerImpl::ApplicationListAccessor accessor; - const ApplicationSet applications = accessor.applications(); + const ApplicationSet applications = + application_manager_.applications().GetData(); 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); } } diff --git a/src/components/application_manager/src/commands/hmi/on_event_changed_notification.cc b/src/components/application_manager/src/commands/hmi/on_event_changed_notification.cc index fe52759c46..02fe73bf4f 100644 --- a/src/components/application_manager/src/commands/hmi/on_event_changed_notification.cc +++ b/src/components/application_manager/src/commands/hmi/on_event_changed_notification.cc @@ -32,13 +32,14 @@ #include "application_manager/commands/hmi/on_event_changed_notification.h" + namespace application_manager { namespace commands { OnEventChangedNotification::OnEventChangedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnEventChangedNotification::~OnEventChangedNotification() { @@ -48,7 +49,7 @@ void OnEventChangedNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); event_engine::Event event(hmi_apis::FunctionID::BasicCommunication_OnEventChanged); 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/on_exit_all_applications_notification.cc b/src/components/application_manager/src/commands/hmi/on_exit_all_applications_notification.cc index 7c09800d21..62ddbc573e 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,7 +36,8 @@ #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" @@ -45,7 +46,8 @@ namespace application_manager { namespace commands { OnExitAllApplicationsNotification::OnExitAllApplicationsNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnExitAllApplicationsNotification::~OnExitAllApplicationsNotification() { @@ -62,8 +64,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; @@ -87,11 +87,11 @@ void OnExitAllApplicationsNotification::Run() { } } - 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); + application_manager_.HeadUnitReset(mob_reason); } kill(getpid(), SIGINT); } @@ -105,9 +105,9 @@ void OnExitAllApplicationsNotification::SendOnSDLPersistenceComplete() { hmi_apis::FunctionID::BasicCommunication_OnSDLPersistenceComplete; (*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 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 5dfd178bc6..4186036b02 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,7 +43,7 @@ namespace application_manager { namespace commands { OnExitApplicationNotification::OnExitApplicationNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) { } OnExitApplicationNotification::~OnExitApplicationNotification() { @@ -54,10 +55,9 @@ void OnExitApplicationNotification::Run() { using namespace mobile_apis; using namespace hmi_apis; - ApplicationManagerImpl* app_mgr = ApplicationManagerImpl::instance(); uint32_t app_id = (*message_)[strings::msg_params][strings::app_id].asUInt(); - ApplicationSharedPtr app_impl = app_mgr->application(app_id); - + ApplicationSharedPtr app_impl = application_manager_.application(app_id); + if (!(app_impl.valid())) { LOG4CXX_ERROR(logger_, "Application does not exist"); return; @@ -69,24 +69,27 @@ void OnExitApplicationNotification::Run() { switch (reason) { case Common_ApplicationExitReason::DRIVER_DISTRACTION_VIOLATION: { - MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile( - app_impl->app_id(), - AppInterfaceUnregisteredReason::DRIVER_DISTRACTION_VIOLATION); + application_manager_.ManageMobileCommand( + MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( + app_id, + AppInterfaceUnregisteredReason::DRIVER_DISTRACTION_VIOLATION), + commands::Command::ORIGIN_SDL); break; } case Common_ApplicationExitReason::USER_EXIT: { break; } case Common_ApplicationExitReason::UNAUTHORIZED_TRANSPORT_REGISTRATION: { - MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile( - app_id, AppInterfaceUnregisteredReason::APP_UNAUTHORIZED); - app_mgr->UnregisterApplication(app_id, Result::SUCCESS); + 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: { - MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile( - app_id, AppInterfaceUnregisteredReason::UNSUPPORTED_HMI_RESOURCE); - app_mgr->UnregisterApplication(app_id, Result::SUCCESS); + application_manager_.ManageMobileCommand(MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( + app_id, AppInterfaceUnregisteredReason::UNSUPPORTED_HMI_RESOURCE), commands::Command::ORIGIN_SDL); + application_manager_.UnregisterApplication(app_id, Result::SUCCESS); return; } default: { @@ -94,9 +97,13 @@ void OnExitApplicationNotification::Run() { return; } } - - ApplicationManagerImpl::instance()->SetState<false>( - app_id, HMILevel::HMI_NONE, AudioStreamingState::NOT_AUDIBLE); + 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); + } } } // 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..9977da6df1 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,14 +31,14 @@ */ #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() { 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..e572e7bd2f 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,8 +36,8 @@ 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() { 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 f02433b76a..126869a2ec 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,15 +31,15 @@ */ #include "application_manager/commands/hmi/on_ignition_cycle_over_notification.h" -#include "application_manager/application_manager_impl.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() { @@ -47,7 +47,7 @@ OnIgnitionCycleOverNotification::~OnIgnitionCycleOverNotification() { void OnIgnitionCycleOverNotification::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().OnIgnitionCycleOver(); + application_manager_.GetPolicyHandler().OnIgnitionCycleOver(); } } // namespace commands 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..36c63002b6 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,8 +38,8 @@ namespace application_manager { namespace commands { OnNaviTBTClientStateNotification::OnNaviTBTClientStateNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnNaviTBTClientStateNotification::~OnNaviTBTClientStateNotification() { 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 index cfcf6b605c..2a28775c5b 100644 --- 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 @@ -37,8 +37,8 @@ namespace application_manager { namespace commands { OnNaviWayPointChangeNotification::OnNaviWayPointChangeNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& app_man) + : NotificationFromHMI(message, app_man) { } OnNaviWayPointChangeNotification::~OnNaviWayPointChangeNotification() { 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 46812df1ee..34010cbd61 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,13 +31,13 @@ */ #include "application_manager/commands/hmi/on_policy_update.h" -#include "application_manager/application_manager_impl.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() { @@ -45,7 +45,7 @@ OnPolicyUpdate::~OnPolicyUpdate() { void OnPolicyUpdate::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().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..24970510c7 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,8 +38,8 @@ namespace application_manager { namespace commands { OnPutFileNotification::OnPutFileNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) { } OnPutFileNotification::~OnPutFileNotification() { 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..0f3798a065 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,14 +31,14 @@ */ #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() { @@ -47,10 +47,10 @@ 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 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 1cd97c639c..a40843c3bf 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,17 +32,19 @@ #include <string> #include "application_manager/commands/hmi/on_received_policy_update.h" -#include "application_manager/application_manager_impl.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_); @@ -53,7 +55,7 @@ void OnReceivedPolicyUpdate::Run() { LOG4CXX_ERROR(logger_, "Failed to read Update file."); return; } - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().ReceiveMessageFromSDK(file_path, file_content); + application_manager_.GetPolicyHandler().ReceiveMessageFromSDK(file_path, file_content); } } // namespace commands 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..45cb9f543b 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,14 +31,14 @@ */ #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() { 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..2e88575866 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,8 +38,8 @@ namespace application_manager { namespace commands { OnResumeAudioSourceNotification::OnResumeAudioSourceNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) { } OnResumeAudioSourceNotification::~OnResumeAudioSourceNotification() { 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 56ebcced4e..35baa40707 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,7 +37,7 @@ namespace application_manager { namespace commands { OnSDLCloseNotification::OnSDLCloseNotification( - const MessageSharedPtr& message) : NotificationToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : NotificationToHMI(message, application_manager) { } OnSDLCloseNotification::~OnSDLCloseNotification() { 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..b7e363798d 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,8 +38,8 @@ namespace application_manager { namespace commands { OnSDLConsentNeededNotification::OnSDLConsentNeededNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) { } OnSDLConsentNeededNotification::~OnSDLConsentNeededNotification() { 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 ff39131a28..6fa7250be2 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,8 +37,8 @@ namespace application_manager { namespace commands { OnSDLPersistenceCompleteNotification::OnSDLPersistenceCompleteNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) { } OnSDLPersistenceCompleteNotification::~OnSDLPersistenceCompleteNotification() { 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..7697b5b8c7 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,14 +31,14 @@ */ #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() { @@ -47,7 +47,7 @@ OnStartDeviceDiscovery::~OnStartDeviceDiscovery() { void OnStartDeviceDiscovery::Run() { LOG4CXX_AUTO_TRACE(logger_); - ApplicationManagerImpl::instance()->StartDevicesDiscovery(); + application_manager_.StartDevicesDiscovery(); } } // namespace commands 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 9f95d04380..385140d67e 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,8 +37,8 @@ namespace application_manager { namespace commands { OnStatusUpdateNotification::OnStatusUpdateNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) { } OnStatusUpdateNotification::~OnStatusUpdateNotification() { 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 a3fc28e5a6..6d9ab5b10e 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,16 +31,17 @@ */ #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() { @@ -57,17 +58,17 @@ void OnSystemContextNotification::Run() { 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()-> + app = application_manager_. application((*message_)[strings::msg_params][strings::app_id].asUInt()); } } if (app && mobile_api::SystemContext::INVALID_ENUM != system_context) { - ApplicationManagerImpl::instance()->SetState(app->app_id(), system_context); + application_manager_.state_controller().SetRegularState(app, system_context); } else { LOG4CXX_ERROR(logger_, "Application does not exist"); } 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 bf1bf7641e..3730dc2c64 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/application_manager_impl.h" +#include "application_manager/application_manager.h" #include "interfaces/HMI_API.h" namespace application_manager { @@ -39,8 +39,8 @@ namespace application_manager { namespace commands { OnSystemErrorNotification::OnSystemErrorNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnSystemErrorNotification::~OnSystemErrorNotification() { @@ -52,8 +52,7 @@ void OnSystemErrorNotification::Run() { const int code = (*message_)[strings::msg_params][hmi_notification::error] .asInt(); - application_manager::ApplicationManagerImpl::instance() - ->GetPolicyHandler().OnSystemError(code); + application_manager_.GetPolicyHandler().OnSystemError(code); } } // namespace commands 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 3f9548a286..9c852caa36 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/application_manager_impl.h" +#include "application_manager/application_manager.h" #include "application_manager/message_helper.h" namespace application_manager { @@ -39,8 +39,8 @@ namespace application_manager { namespace commands { OnSystemInfoChangedNotification::OnSystemInfoChangedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnSystemInfoChangedNotification::~OnSystemInfoChangedNotification() { @@ -54,7 +54,7 @@ void OnSystemInfoChangedNotification::Run() { application_manager::MessageHelper::CommonLanguageToString( static_cast<hmi_apis::Common_Language::eType>(lang_code)); - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().OnSystemInfoChanged(language); + application_manager_.GetPolicyHandler().OnSystemInfoChanged(language); } } // namespace commands 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 57726ac7fb..fd0b4256a1 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,21 +31,21 @@ */ #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_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() { @@ -66,17 +66,14 @@ void OnSystemRequestNotification::Run() { ApplicationSharedPtr app; if (strings::default_app_id == app_id) { const policy::PolicyHandlerInterface& policy_handler = - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler(); + 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 OnSystemRequestNotification"); return; } - ApplicationManagerImpl* app_mgr = ApplicationManagerImpl::instance(); - app = app_mgr->application(selected_app_id); - } else { - app = ApplicationManagerImpl::instance()->application_by_policy_id(app_id); + app = application_manager_.application(selected_app_id); } if (!app.valid()) { 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 de878ae137..d0ef234850 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,16 +41,18 @@ 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(); + application_manager_.hmi_capabilities(); hmi_capabilities.set_active_tts_language( static_cast<hmi_apis::Common_Language::eType>( @@ -68,20 +70,19 @@ void OnTTSLanguageChangeNotification::Run() { (*message_)[strings::params][strings::function_id] = static_cast<int32_t>(mobile_apis::FunctionID::OnLanguageChangeID); - ApplicationManagerImpl::ApplicationListAccessor accessor; - - ApplicationSetConstIt 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( + 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); - ApplicationManagerImpl::instance()->UnregisterApplication( + mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), commands::Command::ORIGIN_SDL); + application_manager_.UnregisterApplication( app->app_id(), mobile_apis::Result::SUCCESS, false); } } 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..51af2ae0d2 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,7 +9,7 @@ namespace commands { namespace hmi { OnTTSResetTimeoutNotification::OnTTSResetTimeoutNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) { } OnTTSResetTimeoutNotification::~OnTTSResetTimeoutNotification() { @@ -20,7 +20,7 @@ void OnTTSResetTimeoutNotification::Run() { event_engine::Event event(hmi_apis::FunctionID::TTS_OnResetTimeout); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace hmi 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..9f9387c27c 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,15 +31,15 @@ */ #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() { @@ -49,7 +49,7 @@ 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 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..2d953651ee 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,8 +39,8 @@ namespace application_manager { namespace commands { OnTTSStoppedNotification::OnTTSStoppedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnTTSStoppedNotification::~OnTTSStoppedNotification() { @@ -51,7 +51,7 @@ void OnTTSStoppedNotification::Run() { event_engine::Event event(hmi_apis::FunctionID::TTS_Stopped); 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/on_ui_command_notification.cc b/src/components/application_manager/src/commands/hmi/on_ui_command_notification.cc index d8fe1ebdea..c6563744d3 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,8 +38,8 @@ namespace application_manager { namespace commands { OnUICommandNotification::OnUICommandNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnUICommandNotification::~OnUICommandNotification() { 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..920a2364da 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,7 +40,7 @@ namespace commands { namespace hmi { OnUIKeyBoardInputNotification::OnUIKeyBoardInputNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) { } OnUIKeyBoardInputNotification::~OnUIKeyBoardInputNotification() { 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 73d710d81a..ea6b9a9722 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,16 +41,18 @@ 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(); + application_manager_.hmi_capabilities(); hmi_capabilities.set_active_ui_language( static_cast<hmi_apis::Common_Language::eType>( @@ -65,7 +67,8 @@ 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(); ApplicationSetConstIt it = accessor.begin(); for (; accessor.end() != it;) { @@ -73,13 +76,13 @@ void OnUILanguageChangeNotification::Run() { (*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( + 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); - ApplicationManagerImpl::instance()->UnregisterApplication( + mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), commands::Command::ORIGIN_SDL); + application_manager_.UnregisterApplication( app->app_id(), mobile_apis::Result::SUCCESS, false); } } @@ -88,3 +91,4 @@ 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..b1be0cd14b 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,7 +41,7 @@ namespace commands { namespace hmi { OnUIResetTimeoutNotification::OnUIResetTimeoutNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) { } OnUIResetTimeoutNotification::~OnUIResetTimeoutNotification() { @@ -52,7 +52,7 @@ void OnUIResetTimeoutNotification::Run() { event_engine::Event event(hmi_apis::FunctionID::UI_OnResetTimeout); event.set_smart_object(*message_); - event.raise(); + event.raise(application_manager_.event_dispatcher()); } } // namespace hmi 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..3c4b9aa50b 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,7 +40,7 @@ namespace commands { namespace hmi { OnUITouchEventNotification::OnUITouchEventNotification( - const MessageSharedPtr& message) : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) : NotificationFromHMI(message, application_manager) { } OnUITouchEventNotification::~OnUITouchEventNotification() { 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..00822582e0 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,14 +30,14 @@ * 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() { 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..a0a71955b0 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIAccPedalPositionNotification::OnVIAccPedalPositionNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIAccPedalPositionNotification::~OnVIAccPedalPositionNotification() { 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..75863903bb 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIBeltStatusNotification::OnVIBeltStatusNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIBeltStatusNotification::~OnVIBeltStatusNotification() { 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..2cab27f29c 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIBodyInformationNotification::OnVIBodyInformationNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIBodyInformationNotification::~OnVIBodyInformationNotification() { 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..bb8f40e318 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIDeviceStatusNotification::OnVIDeviceStatusNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIDeviceStatusNotification::~OnVIDeviceStatusNotification() { 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..7ef3a05211 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIDriverBrakingNotification::OnVIDriverBrakingNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIDriverBrakingNotification::~OnVIDriverBrakingNotification() { 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..390b0eda0a 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIEngineTorqueNotification::OnVIEngineTorqueNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIEngineTorqueNotification::~OnVIEngineTorqueNotification() { 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..c77a54e74e 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIExternalTemperatureNotification::OnVIExternalTemperatureNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIExternalTemperatureNotification::~OnVIExternalTemperatureNotification() { 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..e1aaf6c2f2 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIFuelLevelNotification::OnVIFuelLevelNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIFuelLevelNotification::~OnVIFuelLevelNotification() { 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..174b3dd5cb 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIFuelLevelStateNotification::OnVIFuelLevelStateNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIFuelLevelStateNotification::~OnVIFuelLevelStateNotification() { 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..ceff04e5d7 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIGpsDataNotification::OnVIGpsDataNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIGpsDataNotification::~OnVIGpsDataNotification() { 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..c7304bfc21 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIHeadLampStatusNotification::OnVIHeadLampStatusNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIHeadLampStatusNotification::~OnVIHeadLampStatusNotification() { 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..3177aca5d2 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIInstantFuelConsumptionNotification::OnVIInstantFuelConsumptionNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIInstantFuelConsumptionNotification::~OnVIInstantFuelConsumptionNotification() { 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..1501bbd72d 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIMyKeyNotification::OnVIMyKeyNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIMyKeyNotification::~OnVIMyKeyNotification() { 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..5fd9da0f67 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIOdometerNotification::OnVIOdometerNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIOdometerNotification::~OnVIOdometerNotification() { 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..f58f494fcc 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIPrndlNotification::OnVIPrndlNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIPrndlNotification::~OnVIPrndlNotification() { 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..e9e262b6d5 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIRpmNotification::OnVIRpmNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIRpmNotification::~OnVIRpmNotification() { 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..a875b168c7 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVISpeedNotification::OnVISpeedNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVISpeedNotification::~OnVISpeedNotification() { 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..f51fce263b 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVISteeringWheelAngleNotification::OnVISteeringWheelAngleNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVISteeringWheelAngleNotification::~OnVISteeringWheelAngleNotification() { 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..8e77c98c4f 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVITirePressureNotification::OnVITirePressureNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVITirePressureNotification::~OnVITirePressureNotification() { 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..7b5fa3cc4f 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIVehicleDataNotification::OnVIVehicleDataNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIVehicleDataNotification::~OnVIVehicleDataNotification() { 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..330e91bf3b 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIVinNotification::OnVIVinNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIVinNotification::~OnVIVinNotification() { 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..0b2719ee50 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVIWiperStatusNotification::OnVIWiperStatusNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVIWiperStatusNotification::~OnVIWiperStatusNotification() { 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..4af2c2ee1d 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,8 +38,8 @@ namespace application_manager { namespace commands { OnVideoDataStreamingNotification::OnVideoDataStreamingNotification( - const MessageSharedPtr& message) - : NotificationToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationToHMI(message, application_manager) { } OnVideoDataStreamingNotification::~OnVideoDataStreamingNotification() { 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..0749537e07 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,8 +45,8 @@ namespace application_manager { namespace commands { OnVRCommandNotification::OnVRCommandNotification( - const MessageSharedPtr& message) - : NotificationFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : NotificationFromHMI(message, application_manager) { } OnVRCommandNotification::~OnVRCommandNotification() { @@ -52,20 +54,21 @@ 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(); + 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; } @@ -75,7 +78,7 @@ void OnVRCommandNotification::Run() { } const uint32_t app_id = (*message_)[strings::msg_params][strings::app_id] .asUInt(); - ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(app_id); + ApplicationSharedPtr app = application_manager_.application(app_id); if (!app) { LOG4CXX_ERROR(logger_, "NULL pointer"); return; @@ -87,7 +90,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); 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 5c35f7e753..2412fd8e9f 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,16 +42,18 @@ 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(); + application_manager_.hmi_capabilities(); hmi_capabilities.set_active_vr_language( static_cast<hmi_apis::Common_Language::eType>( @@ -62,22 +65,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(); 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); + 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); - MessageHelper::SendOnAppInterfaceUnregisteredNotificationToMobile( + application_manager_.ManageMobileCommand(MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile( app->app_id(), - mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE); - ApplicationManagerImpl::instance()->UnregisterApplication( + mobile_api::AppInterfaceUnregisteredReason::LANGUAGE_CHANGE), commands::Command::ORIGIN_SDL); + application_manager_.UnregisterApplication( app->app_id(), mobile_apis::Result::SUCCESS, false); } } 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..f87f50f178 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,15 +31,15 @@ */ #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() { @@ -50,7 +50,7 @@ void OnVRStartedNotification::Run() { event_engine::Event event(hmi_apis::FunctionID::VR_Started); 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/on_vr_stopped_notification.cc b/src/components/application_manager/src/commands/hmi/on_vr_stopped_notification.cc index 89bdc18eb3..fa13eb509f 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,15 +31,15 @@ */ #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() { @@ -50,7 +50,7 @@ void OnVRStoppedNotification::Run() { event_engine::Event event(hmi_apis::FunctionID::VR_Stopped); 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/request_from_hmi.cc b/src/components/application_manager/src/commands/hmi/request_from_hmi.cc index 5713cf2a15..03a8bcfe8b 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,17 +31,19 @@ */ #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() { @@ -61,18 +63,42 @@ void RequestFromHMI::Run() { void RequestFromHMI::on_event(const event_engine::Event& event) { } -void RequestFromHMI::SendResponse(uint32_t correlation_id, - hmi_apis::FunctionID::eType function_id, - hmi_apis::Common_Result::eType result_code) { +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); + smart_objects::SmartType_Map); + FillCommonParametersOfSO(message, correlation_id, function_id); + (*message)[strings::params][strings::message_type] = MessageType::kResponse; + (*message)[strings::params][hmi_response::code] = 0; + (*message)[strings::msg_params][strings::success] = success; + (*message)[strings::msg_params][strings::result_code] = result_code; + + 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::message_type] = MessageType::kResponse; + (*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; - (*message)[strings::params][hmi_response::code] = result_code; - - ApplicationManagerImpl::instance()->ManageHMICommand(message); } 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..adb3e0764b 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,17 +31,18 @@ */ #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() { @@ -62,7 +63,7 @@ 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..9dd4862aac 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,23 +31,24 @@ */ #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() { @@ -64,10 +65,10 @@ bool ResponseFromHMI::CleanUp() { 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( @@ -82,8 +83,7 @@ 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 +96,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..0b9ea5a768 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,16 +31,17 @@ */ #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() { @@ -58,7 +59,7 @@ 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 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 cb2cd0b881..96864cbf6b 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 @@ -31,17 +31,19 @@ */ #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) {} +SDLActivateAppRequest::SDLActivateAppRequest(const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestFromHMI(message, application_manager) { +} -SDLActivateAppRequest::~SDLActivateAppRequest() {} +SDLActivateAppRequest::~SDLActivateAppRequest() { +} void SDLActivateAppRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); @@ -51,21 +53,12 @@ void SDLActivateAppRequest::Run() { const uint32_t application_id = app_id(); ApplicationConstSharedPtr app = - ApplicationManagerImpl::instance()->application(application_id); + application_manager_.application(application_id); if (!app) { LOG4CXX_WARN( logger_, "Can't find application within regular apps: " << application_id); - - app = ApplicationManagerImpl::instance()->waiting_app(application_id); - - if (!app) { - LOG4CXX_WARN( - logger_, - "Can't find application within waiting apps: " << application_id); - return; - } } DevicesApps devices_apps = FindAllAppOnParticularDevice(app->device()); @@ -74,31 +67,33 @@ void SDLActivateAppRequest::Run() { "Can't find regular foreground app with the same " "connection id:" << app->device()); - SendResponse(correlation_id(), SDL_ActivateApp, NO_APPS_REGISTERED); + SendResponse(false, correlation_id(), SDL_ActivateApp, NO_APPS_REGISTERED); return; } if (!app->IsRegistered()) { if (devices_apps.first) { MessageHelper::SendLaunchApp( - devices_apps.first->app_id(), app->SchemaUrl(), app->PackageName()); + devices_apps.first->app_id(), app->SchemaUrl(), app->PackageName(), application_manager_); } 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()); + (*it)->app_id(), app->SchemaUrl(), app->PackageName(), application_manager_); } } subscribe_on_event(BasicCommunication_OnAppRegistered); } else { if (devices_apps.first) { - MessageHelper::SendLaunchApp( - devices_apps.first->app_id(), app->SchemaUrl(), app->PackageName()); + MessageHelper::SendLaunchApp(devices_apps.first->app_id(), + app->SchemaUrl(), + app->PackageName(), + application_manager_); } else { - application_manager::ApplicationManagerImpl::instance() - ->GetPolicyHandler() - .OnActivateApp(application_id, correlation_id()); + const uint32_t application_id = app_id(); + application_manager_.GetPolicyHandler().OnActivateApp(application_id, + correlation_id()); } } } @@ -108,7 +103,7 @@ 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) { @@ -124,22 +119,21 @@ 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); return; } - application_manager::ApplicationManagerImpl::instance() - ->GetPolicyHandler() + 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(); + if ((*message_)[strings::msg_params].keyExists(strings::app_id)){ + return (*message_)[strings::msg_params][strings::app_id].asUInt(); } } LOG4CXX_DEBUG(logger_, "app_id section is absent in the message."); @@ -164,9 +158,7 @@ uint32_t SDLActivateAppRequest::hmi_app_id( DevicesApps SDLActivateAppRequest::FindAllAppOnParticularDevice( const connection_handler::DeviceHandle handle) { DevicesApps apps; - - ApplicationManagerImpl::ApplicationListAccessor accessor; - const ApplicationSet app_list = accessor.applications(); + const ApplicationSet app_list = application_manager_.applications().GetData(); ApplicationSetIt it = app_list.begin(); ApplicationSetIt it_end = app_list.end(); 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..dd0a7faae9 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,14 +31,14 @@ */ #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() { @@ -49,7 +49,7 @@ void SDLActivateAppResponse::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 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 4575c045c3..693cb83392 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,15 +31,15 @@ */ #include "application_manager/commands/hmi/sdl_get_list_of_permissions_request.h" -#include "application_manager/application_manager_impl.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() { @@ -51,7 +51,7 @@ void SDLGetListOfPermissionsRequest::Run() { if ((*message_)[strings::msg_params].keyExists(strings::app_id)) { connection_key = (*message_)[strings::msg_params][strings::app_id].asUInt(); } - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().OnGetListOfPermissions( + application_manager_.GetPolicyHandler().OnGetListOfPermissions( connection_key, (*message_)[strings::params][strings::correlation_id].asUInt()); } 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..bd8b7c011d 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,14 +31,14 @@ */ #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() { @@ -49,7 +49,7 @@ void SDLGetListOfPermissionsResponse::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 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 00a1d90928..a3829111d5 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,14 +31,14 @@ */ #include "application_manager/commands/hmi/sdl_get_status_update_request.h" -#include "application_manager/application_manager_impl.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() { @@ -46,7 +46,7 @@ SDLGetStatusUpdateRequest::~SDLGetStatusUpdateRequest() { void SDLGetStatusUpdateRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().OnGetStatusUpdate( + application_manager_.GetPolicyHandler().OnGetStatusUpdate( (*message_)[strings::params][strings::correlation_id].asUInt()); } 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..2108b8856d 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,14 +31,14 @@ */ #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() { @@ -49,7 +49,7 @@ void SDLGetStatusUpdateResponse::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 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 b4905d3d1c..d8f9fbdeb9 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,7 +31,6 @@ */ #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" namespace application_manager { @@ -39,8 +38,8 @@ namespace application_manager { namespace commands { SDLGetUserFriendlyMessageRequest::SDLGetUserFriendlyMessageRequest( - const MessageSharedPtr& message) - : RequestFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestFromHMI(message, application_manager) { } SDLGetUserFriendlyMessageRequest::~SDLGetUserFriendlyMessageRequest() { @@ -73,15 +72,13 @@ void SDLGetUserFriendlyMessageRequest::Run() { application_manager::MessageHelper::CommonLanguageToString( 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(); + hmi_apis::Common_Language::eType ui_language = application_manager_.hmi_capabilities().active_ui_language(); required_language = application_manager::MessageHelper::CommonLanguageToString(ui_language); } - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().OnGetUserFriendlyMessage( + application_manager_.GetPolicyHandler().OnGetUserFriendlyMessage( msg_codes, required_language, (*message_)[strings::params][strings::correlation_id].asInt()); } 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..b4e6549bb2 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,14 +31,14 @@ */ #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() { @@ -49,7 +49,7 @@ void SDLGetUserFriendlyMessageResponse::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 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 b9c5aaa086..4649f86cfe 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 @@ -37,7 +37,7 @@ namespace application_manager { namespace commands { SDLPolicyUpdate::SDLPolicyUpdate( - const MessageSharedPtr& message): RequestToHMI(message) { + 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..f15ec9123d 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,7 +36,7 @@ namespace application_manager { namespace commands { SDLPolicyUpdateResponse::SDLPolicyUpdateResponse( - const MessageSharedPtr& message): ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager): ResponseFromHMI(message, application_manager) { } SDLPolicyUpdateResponse::~SDLPolicyUpdateResponse() { 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..65d11922c2 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,8 +37,8 @@ namespace application_manager { namespace commands { TTSChangeRegistrationRequest::TTSChangeRegistrationRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } TTSChangeRegistrationRequest::~TTSChangeRegistrationRequest() { 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..e5582a1edc 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,8 +39,8 @@ namespace application_manager { namespace commands { TTSChangeRegistratioResponse::TTSChangeRegistratioResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } TTSChangeRegistratioResponse::~TTSChangeRegistratioResponse() { @@ -50,7 +51,7 @@ void TTSChangeRegistratioResponse::Run() { 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..4892c6889a 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,8 +37,8 @@ namespace application_manager { namespace commands { TTSGetCapabilitiesRequest::TTSGetCapabilitiesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } TTSGetCapabilitiesRequest::~TTSGetCapabilitiesRequest() { 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..8722979a51 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,15 +30,15 @@ * 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() { @@ -48,7 +48,7 @@ void TTSGetCapabilitiesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->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]); 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..e55e5e7fdc 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,8 +36,8 @@ 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() { 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 996e977d60..49e7e6d5d1 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 @@ -30,15 +30,15 @@ * 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() { @@ -57,7 +57,7 @@ void TTSGetLanguageResponse::Run() { (*message_)[strings::msg_params][hmi_response::language].asInt()); } - ApplicationManagerImpl::instance()->hmi_capabilities(). + application_manager_.hmi_capabilities(). set_active_tts_language(language); LOG4CXX_DEBUG(logger_, "Raising event for function_id " @@ -65,7 +65,7 @@ void TTSGetLanguageResponse::Run() { << " and correlation_id " << correlation_id()); event_engine::Event event(FunctionID::TTS_GetLanguage); 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_supported_languages_request.cc b/src/components/application_manager/src/commands/hmi/tts_get_supported_languages_request.cc index 5251832bc1..a87b31072d 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,8 +37,8 @@ namespace application_manager { namespace commands { TTSGetSupportedLanguagesRequest::TTSGetSupportedLanguagesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } TTSGetSupportedLanguagesRequest::~TTSGetSupportedLanguagesRequest() { 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..3e34acacdf 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,8 +38,8 @@ namespace application_manager { namespace commands { TTSGetSupportedLanguagesResponse::TTSGetSupportedLanguagesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } TTSGetSupportedLanguagesResponse::~TTSGetSupportedLanguagesResponse() { @@ -54,7 +54,7 @@ void TTSGetSupportedLanguagesResponse::Run() { if (hmi_apis::Common_Result::SUCCESS == code) { HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->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..39d20b20df 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,8 +36,8 @@ 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() { 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..332a139f55 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,14 +30,14 @@ * 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() { @@ -53,7 +53,7 @@ void TTSIsReadyResponse::Run() { } HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->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..6139df4eaf 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,8 +37,8 @@ namespace application_manager { namespace commands { TTSSetGlobalPropertiesRequest::TTSSetGlobalPropertiesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } TTSSetGlobalPropertiesRequest::~TTSSetGlobalPropertiesRequest() { 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..3ab850493f 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,8 +39,8 @@ namespace application_manager { namespace commands { TTSSetGlobalPropertiesResponse::TTSSetGlobalPropertiesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } TTSSetGlobalPropertiesResponse::~TTSSetGlobalPropertiesResponse() { @@ -50,7 +51,7 @@ void TTSSetGlobalPropertiesResponse::Run() { 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..eaddeb2a18 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,8 +36,8 @@ 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() { 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..b0c55b2f7a 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,8 +39,8 @@ 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() { @@ -50,7 +51,7 @@ void TTSSpeakResponse::Run() { 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..903a474b55 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,8 +36,8 @@ 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() { 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..5e8e286e9b 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,8 +38,8 @@ namespace application_manager { namespace commands { TTSStopSpeakingResponse::TTSStopSpeakingResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } TTSStopSpeakingResponse::~TTSStopSpeakingResponse() { @@ -50,7 +50,7 @@ void TTSStopSpeakingResponse::Run() { 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..84d18e8667 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,8 +36,8 @@ 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() { 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..96a1a00c3d 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,8 +37,8 @@ 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() { @@ -49,7 +49,7 @@ void UIAddCommandResponse::Run() { 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 891b9a5e18..cf080a8d04 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,8 +36,8 @@ 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() { 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..cd8d6c9b35 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,14 +31,15 @@ */ #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() { @@ -49,7 +50,7 @@ void UIAddSubmenuResponse::Run() { 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..ae8e8d1e88 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,8 +36,8 @@ 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() { 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..865535e879 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,14 +31,15 @@ */ #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() { @@ -49,7 +50,7 @@ void UIAlertResponse::Run() { 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..87a9e4ba62 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,8 +37,8 @@ namespace application_manager { namespace commands { UIChangeRegistrationRequest::UIChangeRegistrationRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } UIChangeRegistrationRequest::~UIChangeRegistrationRequest() { 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..dea74fc2d7 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,8 +39,8 @@ namespace application_manager { namespace commands { UIChangeRegistratioResponse::UIChangeRegistratioResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } UIChangeRegistratioResponse::~UIChangeRegistratioResponse() { @@ -50,7 +51,7 @@ void UIChangeRegistratioResponse::Run() { 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..711067abf8 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,8 +36,8 @@ 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() { 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..ac03d015f4 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,8 +39,8 @@ namespace application_manager { namespace commands { UIDeleteCommandResponse::UIDeleteCommandResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } UIDeleteCommandResponse::~UIDeleteCommandResponse() { @@ -50,7 +51,7 @@ void UIDeleteCommandResponse::Run() { 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..9143186526 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,8 +36,8 @@ 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() { 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..6926bddefa 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,8 +39,8 @@ namespace application_manager { namespace commands { UIDeleteSubmenuResponse::UIDeleteSubmenuResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } UIDeleteSubmenuResponse::~UIDeleteSubmenuResponse() { @@ -50,7 +51,7 @@ void UIDeleteSubmenuResponse::Run() { 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..7837cc1bca 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,8 +37,8 @@ namespace application_manager { namespace commands { UIEndAudioPassThruRequest::UIEndAudioPassThruRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } UIEndAudioPassThruRequest::~UIEndAudioPassThruRequest() { 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..38d5c75cf8 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,8 +39,8 @@ namespace application_manager { namespace commands { UIEndAudioPassThruResponse::UIEndAudioPassThruResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } UIEndAudioPassThruResponse::~UIEndAudioPassThruResponse() { @@ -50,7 +51,7 @@ void UIEndAudioPassThruResponse::Run() { 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..acbd8d277a 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,8 +37,8 @@ namespace application_manager { namespace commands { UIGetCapabilitiesRequest::UIGetCapabilitiesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } UIGetCapabilitiesRequest::~UIGetCapabilitiesRequest() { 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..e0a07736f4 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,15 +30,15 @@ * 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() { @@ -48,7 +48,7 @@ void UIGetCapabilitiesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + application_manager_.hmi_capabilities(); const smart_objects::SmartObject& msg_params = (*message_)[strings::msg_params]; 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..698cdc84ab 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,8 +36,8 @@ 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() { 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 206f7d84a6..02527a19d2 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 @@ -30,7 +30,7 @@ * 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" @@ -38,8 +38,8 @@ 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() { @@ -58,7 +58,7 @@ void UIGetLanguageResponse::Run() { (*message_)[strings::msg_params][hmi_response::language].asInt()); } - ApplicationManagerImpl::instance()->hmi_capabilities(). + application_manager_.hmi_capabilities(). set_active_ui_language(language); LOG4CXX_DEBUG(logger_, "Raising event for function_id " @@ -66,7 +66,7 @@ void UIGetLanguageResponse::Run() { << " and correlation_id " << correlation_id()); event_engine::Event event(FunctionID::UI_GetLanguage); 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_supported_languages_request.cc b/src/components/application_manager/src/commands/hmi/ui_get_supported_languages_request.cc index 5cd0c09e65..55959c5638 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,8 +37,8 @@ namespace application_manager { namespace commands { UIGetSupportedLanguagesRequest::UIGetSupportedLanguagesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } UIGetSupportedLanguagesRequest::~UIGetSupportedLanguagesRequest() { 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..d7b0d6b359 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,8 +38,8 @@ namespace application_manager { namespace commands { UIGetSupportedLanguagesResponse::UIGetSupportedLanguagesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } UIGetSupportedLanguagesResponse::~UIGetSupportedLanguagesResponse() { @@ -54,7 +54,7 @@ void UIGetSupportedLanguagesResponse::Run() { if (hmi_apis::Common_Result::SUCCESS == code) { HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->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..efe4ddcd2a 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,8 +36,8 @@ 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() { 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..98ff58c752 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,14 +30,14 @@ * 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() { @@ -53,7 +53,7 @@ void UIIsReadyResponse::Run() { } HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->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..52a39e1ecc 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,8 +37,8 @@ namespace application_manager { namespace commands { UIPerformAudioPassThruRequest::UIPerformAudioPassThruRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } UIPerformAudioPassThruRequest::~UIPerformAudioPassThruRequest() { 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..47299698ab 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,8 +38,8 @@ namespace application_manager { namespace commands { UIPerformAudioPassThruResponse::UIPerformAudioPassThruResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } UIPerformAudioPassThruResponse::~UIPerformAudioPassThruResponse() { @@ -50,7 +50,7 @@ void UIPerformAudioPassThruResponse::Run() { 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..9199ad23e8 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,8 +37,8 @@ namespace application_manager { namespace commands { UIPerformInteractionRequest::UIPerformInteractionRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } UIPerformInteractionRequest::~UIPerformInteractionRequest() { 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..0d264ee3af 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,8 +38,8 @@ namespace application_manager { namespace commands { UIPerformInteractionResponse::UIPerformInteractionResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } UIPerformInteractionResponse::~UIPerformInteractionResponse() { @@ -49,7 +49,7 @@ 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..3f08393d39 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,8 +37,8 @@ namespace application_manager { namespace commands { UIScrollableMessageRequest::UIScrollableMessageRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } UIScrollableMessageRequest::~UIScrollableMessageRequest() { 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..129872dec4 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,8 +38,8 @@ namespace application_manager { namespace commands { UIScrollableMessageResponse::UIScrollableMessageResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } UIScrollableMessageResponse::~UIScrollableMessageResponse() { @@ -50,7 +50,7 @@ void UIScrollableMessageResponse::Run() { 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..585a2f4101 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,8 +36,8 @@ 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() { 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..e518b5651b 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,8 +37,8 @@ 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() { @@ -49,7 +49,7 @@ void UISetAppIconResponse::Run() { 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..46df71803c 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,7 +37,7 @@ namespace application_manager { namespace commands { UiSetDisplayLayoutRequest::UiSetDisplayLayoutRequest( - const MessageSharedPtr& message): RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager): RequestToHMI(message, application_manager) { } UiSetDisplayLayoutRequest::~UiSetDisplayLayoutRequest() { 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..46cea52160 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,7 +39,7 @@ namespace application_manager { namespace commands { UiSetDisplayLayoutResponse::UiSetDisplayLayoutResponse( - const MessageSharedPtr& message): ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager): ResponseFromHMI(message, application_manager) { } UiSetDisplayLayoutResponse::~UiSetDisplayLayoutResponse() { @@ -50,7 +50,7 @@ void UiSetDisplayLayoutResponse::Run() { 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..6e26c74c26 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,8 +37,8 @@ namespace application_manager { namespace commands { UISetGlobalPropertiesRequest::UISetGlobalPropertiesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } UISetGlobalPropertiesRequest::~UISetGlobalPropertiesRequest() { 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..9dc6659e8f 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,8 +38,8 @@ namespace application_manager { namespace commands { UISetGlobalPropertiesResponse::UISetGlobalPropertiesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } UISetGlobalPropertiesResponse::~UISetGlobalPropertiesResponse() { @@ -50,7 +50,7 @@ void UISetGlobalPropertiesResponse::Run() { 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_media_clock_timer_request.cc b/src/components/application_manager/src/commands/hmi/ui_set_media_clock_timer_request.cc index 272ff561aa..0f2c66e7e1 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,8 +37,8 @@ namespace application_manager { namespace commands { UISetMediaClockTimerRequest::UISetMediaClockTimerRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } UISetMediaClockTimerRequest::~UISetMediaClockTimerRequest() { 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..66b4168ee5 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,8 +38,8 @@ namespace application_manager { namespace commands { UISetMediaClockTimerResponse::UISetMediaClockTimerResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } UISetMediaClockTimerResponse::~UISetMediaClockTimerResponse() { @@ -50,7 +50,7 @@ void UISetMediaClockTimerResponse::Run() { 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..3d9310f5e3 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,8 +36,8 @@ 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() { 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..644412c0ec 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,8 +36,8 @@ 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() { @@ -48,7 +48,7 @@ void UIShowResponse::Run() { 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..2a8c383bc4 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,8 +36,8 @@ 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() { 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..1a036015b3 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,8 +37,8 @@ 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() { @@ -49,7 +49,7 @@ void UISliderResponse::Run() { 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..ccd0858e72 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,8 +36,8 @@ 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() { 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..f8a1fe5489 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,8 +36,8 @@ 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() { 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..93da0b9eb8 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,8 @@ */ #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,9 +42,9 @@ 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() { } @@ -55,8 +55,8 @@ void UpdateDeviceListRequest::Run() { // 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 // 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); 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..1a53231a3b 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,8 +36,8 @@ namespace application_manager { namespace commands { UpdateDeviceListResponse::UpdateDeviceListResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } UpdateDeviceListResponse::~UpdateDeviceListResponse() { 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 53df9c0584..c476de2665 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,14 +32,13 @@ */ #include "application_manager/commands/hmi/update_sdl_request.h" -#include "application_manager/application_manager_impl.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() { @@ -48,7 +47,7 @@ UpdateSDLRequest::~UpdateSDLRequest() { void UpdateSDLRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().PTExchangeAtUserRequest( + application_manager_.GetPolicyHandler().PTExchangeAtUserRequest( (*message_)[strings::params][strings::correlation_id].asInt()); } 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..aa5dc32881 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,14 +30,14 @@ * 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) { + const MessageSharedPtr& message, ApplicationManager& application_manager): ResponseFromHMI(message, application_manager) { } UpdateSDLResponse::~UpdateSDLResponse() { @@ -48,7 +48,7 @@ void UpdateSDLResponse::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 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..0a06b37817 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,8 +36,8 @@ 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() { 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..fa3ddbeea0 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,8 +37,8 @@ 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() { @@ -49,7 +49,7 @@ void VIDiagnosticMessageResponse::Run() { 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..3584a8a43b 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,8 +36,8 @@ 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() { 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..e17c97ddd5 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,8 +37,8 @@ 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() { @@ -49,7 +49,7 @@ void VIGetDTCsResponse::Run() { 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..f4a6bb45b7 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,8 +37,8 @@ namespace application_manager { namespace commands { VIGetVehicleDataRequest::VIGetVehicleDataRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } VIGetVehicleDataRequest::~VIGetVehicleDataRequest() { 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 9e6fdffe7d..b826b90753 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,15 +31,14 @@ */ #include "application_manager/commands/hmi/vi_get_vehicle_data_response.h" #include "application_manager/event_engine/event.h" -#include "application_manager/application_manager_impl.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() { @@ -73,10 +72,10 @@ void VIGetVehicleDataResponse::Run() { event.set_smart_object(result); } else { event.set_smart_object(*message_); - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().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..465528f402 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,8 +37,8 @@ namespace application_manager { namespace commands { VIGetVehicleTypeRequest::VIGetVehicleTypeRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } VIGetVehicleTypeRequest::~VIGetVehicleTypeRequest() { 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..edc74b503c 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,15 +30,15 @@ * 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() { @@ -48,7 +48,7 @@ void VIGetVehicleTypeResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->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..3c75072f85 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,8 +36,8 @@ 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() { 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 54f90f02d6..d4da852b73 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,14 +30,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "application_manager/commands/hmi/vi_is_ready_response.h" -#include "application_manager/application_manager_impl.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() { @@ -53,10 +52,10 @@ void VIIsReadyResponse::Run() { } HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + application_manager_.hmi_capabilities(); hmi_capabilities.set_is_ivi_cooperating(is_available); - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler().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..2399182cb6 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,8 +36,8 @@ 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() { 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..d41df3caa7 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,15 +31,15 @@ */ #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() { @@ -50,7 +50,7 @@ void VIReadDIDResponse::Run() { 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..85b7d7d9dc 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,8 +37,8 @@ namespace application_manager { namespace commands { VISubscribeVehicleDataRequest::VISubscribeVehicleDataRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } VISubscribeVehicleDataRequest::~VISubscribeVehicleDataRequest() { 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..97a37d9bfd 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,8 +37,8 @@ namespace application_manager { namespace commands { VISubscribeVehicleDataResponse::VISubscribeVehicleDataResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } VISubscribeVehicleDataResponse::~VISubscribeVehicleDataResponse() { @@ -50,7 +50,7 @@ void VISubscribeVehicleDataResponse::Run() { 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..073e767a5c 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,8 +37,8 @@ namespace application_manager { namespace commands { VIUnsubscribeVehicleDataRequest::VIUnsubscribeVehicleDataRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } VIUnsubscribeVehicleDataRequest::~VIUnsubscribeVehicleDataRequest() { 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..15df29d5e7 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,8 +37,8 @@ namespace application_manager { namespace commands { VIUnsubscribeVehicleDataResponse::VIUnsubscribeVehicleDataResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } VIUnsubscribeVehicleDataResponse::~VIUnsubscribeVehicleDataResponse() { @@ -50,7 +50,7 @@ void VIUnsubscribeVehicleDataResponse::Run() { 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..28ac3df84c 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,8 +36,8 @@ 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() { 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..11581af91d 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,14 +31,15 @@ */ #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() { @@ -49,7 +50,7 @@ void VRAddCommandResponse::Run() { 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..067292ecd0 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,8 +37,8 @@ namespace application_manager { namespace commands { VRChangeRegistrationRequest::VRChangeRegistrationRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } VRChangeRegistrationRequest::~VRChangeRegistrationRequest() { 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 1109d85337..1b322a5d7e 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,8 +38,8 @@ namespace application_manager { namespace commands { VRChangeRegistrationResponse::VRChangeRegistrationResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } VRChangeRegistrationResponse::~VRChangeRegistrationResponse() { @@ -50,7 +50,7 @@ void VRChangeRegistrationResponse::Run() { 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..ed0924c293 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,8 +36,8 @@ 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() { 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..42021f23cf 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,8 +38,8 @@ namespace application_manager { namespace commands { VRDeleteCommandResponse::VRDeleteCommandResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } VRDeleteCommandResponse::~VRDeleteCommandResponse() { @@ -50,7 +50,7 @@ void VRDeleteCommandResponse::Run() { 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..46f9d4a397 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,8 +37,8 @@ namespace application_manager { namespace commands { VRGetCapabilitiesRequest::VRGetCapabilitiesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } VRGetCapabilitiesRequest::~VRGetCapabilitiesRequest() { 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..f4537ed928 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,15 +30,15 @@ * 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() { @@ -48,7 +48,7 @@ void VRGetCapabilitiesResponse::Run() { LOG4CXX_AUTO_TRACE(logger_); HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->hmi_capabilities(); + application_manager_.hmi_capabilities(); hmi_capabilities.set_vr_capabilities( (*message_)[strings::msg_params][strings::vr_capabilities]); 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..098607294d 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,8 +36,8 @@ 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() { 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 831fb5040c..27ff302089 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 @@ -30,7 +30,7 @@ * 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" @@ -38,8 +38,8 @@ 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() { @@ -58,7 +58,7 @@ void VRGetLanguageResponse::Run() { (*message_)[strings::msg_params][hmi_response::language].asInt()); } - ApplicationManagerImpl::instance()->hmi_capabilities(). + application_manager_.hmi_capabilities(). set_active_vr_language(language); LOG4CXX_DEBUG(logger_, "Raising event for function_id " @@ -66,7 +66,7 @@ void VRGetLanguageResponse::Run() { << " and correlation_id " << correlation_id()); event_engine::Event event(FunctionID::VR_GetLanguage); 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_supported_languages_request.cc b/src/components/application_manager/src/commands/hmi/vr_get_supported_languages_request.cc index aea97da02d..c2de988e93 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,8 +37,8 @@ namespace application_manager { namespace commands { VRGetSupportedLanguagesRequest::VRGetSupportedLanguagesRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } VRGetSupportedLanguagesRequest::~VRGetSupportedLanguagesRequest() { 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..a33ba3d48e 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,8 +39,8 @@ namespace application_manager { namespace commands { VRGetSupportedLanguagesResponse::VRGetSupportedLanguagesResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } VRGetSupportedLanguagesResponse::~VRGetSupportedLanguagesResponse() { @@ -55,7 +55,7 @@ void VRGetSupportedLanguagesResponse::Run() { if (hmi_apis::Common_Result::SUCCESS == code) { HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->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..b72b5b378b 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,8 +36,8 @@ 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() { 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..75e39120a8 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,14 +30,14 @@ * 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() { @@ -53,7 +53,7 @@ void VRIsReadyResponse::Run() { } HMICapabilities& hmi_capabilities = - ApplicationManagerImpl::instance()->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..c86f4f23b3 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,8 +37,8 @@ namespace application_manager { namespace commands { VRPerformInteractionRequest::VRPerformInteractionRequest( - const MessageSharedPtr& message) - : RequestToHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : RequestToHMI(message, application_manager) { } VRPerformInteractionRequest::~VRPerformInteractionRequest() { 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..a8b8231114 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,8 +37,8 @@ namespace application_manager { namespace commands { VRPerformInteractionResponse::VRPerformInteractionResponse( - const MessageSharedPtr& message) - : ResponseFromHMI(message) { + const MessageSharedPtr& message, ApplicationManager& application_manager) + : ResponseFromHMI(message, application_manager) { } VRPerformInteractionResponse::~VRPerformInteractionResponse() { @@ -48,7 +48,7 @@ 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 |