diff options
Diffstat (limited to 'src/components/application_manager/src/commands/mobile/register_app_interface_response.cc')
-rw-r--r-- | src/components/application_manager/src/commands/mobile/register_app_interface_response.cc | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_response.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_response.cc index 8674a62b15..576f842bf7 100644 --- a/src/components/application_manager/src/commands/mobile/register_app_interface_response.cc +++ b/src/components/application_manager/src/commands/mobile/register_app_interface_response.cc @@ -33,7 +33,8 @@ #include "application_manager/commands/mobile/register_app_interface_response.h" #include "interfaces/MOBILE_API.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" +#include "application_manager/policies/policy_handler_interface.h" #include "connection_handler/connection_handler.h" #include "application_manager/policies/policy_handler_interface.h" @@ -47,11 +48,13 @@ void RegisterAppInterfaceResponse::Run() { mobile_apis::Result::eType result_code = mobile_apis::Result::SUCCESS; bool success = (*message_)[strings::msg_params][strings::success].asBool(); bool last_message = !success; - // Do not close connection in case of APPLICATION_NOT_REGISTERED despite it is an error - if (!success && (*message_)[strings::msg_params].keyExists(strings::result_code)) { + // Do not close connection in case of APPLICATION_NOT_REGISTERED despite it is + // an error + if (!success && + (*message_)[strings::msg_params].keyExists(strings::result_code)) { result_code = static_cast<mobile_apis::Result::eType>( (*message_)[strings::msg_params][strings::result_code].asInt()); - if (result_code == mobile_apis::Result::APPLICATION_REGISTERED_ALREADY) { + if (result_code == mobile_apis::Result::APPLICATION_REGISTERED_ALREADY) { last_message = false; } } @@ -63,36 +66,36 @@ void RegisterAppInterfaceResponse::Run() { // Add registered application to the policy db right after response sent to // mobile to be able to check all other API according to app permissions application_manager::ApplicationSharedPtr application = - application_manager::ApplicationManagerImpl::instance()->application( + application_manager_.application( connection_key()); if (!application) { - LOG4CXX_ERROR(logger_, "Application with connection key " - << connection_key() << " is not registered."); + LOG4CXX_ERROR(logger_, + "Application with connection key " << connection_key() + << " is not registered."); return; } - SetHeartBeatTimeout(connection_key(), application->mobile_app_id()); + SetHeartBeatTimeout(connection_key(), application->policy_app_id()); // Default HMI level should be set before any permissions validation, since it // relies on HMI level. - ApplicationManagerImpl::instance()->OnApplicationRegistered(application); + application_manager_.OnApplicationRegistered(application); // Sends OnPermissionChange notification to mobile right after RAI response // and HMI level set-up - application_manager::ApplicationManagerImpl::instance() - ->GetPolicyHandler().OnAppRegisteredOnMobile(application->mobile_app_id()); + application_manager_.GetPolicyHandler().OnAppRegisteredOnMobile(application->policy_app_id()); } void RegisterAppInterfaceResponse::SetHeartBeatTimeout( uint32_t connection_key, const std::string& mobile_app_id) { LOG4CXX_AUTO_TRACE(logger_); - const policy::PolicyHandlerInterface& policy_handler = - application_manager::ApplicationManagerImpl::instance()->GetPolicyHandler(); + policy::PolicyHandlerInterface& policy_handler = + application_manager_.GetPolicyHandler(); if (policy_handler.PolicyEnabled()) { const uint32_t timeout = policy_handler.HeartBeatTimeout(mobile_app_id); if (timeout > 0) { - application_manager::ApplicationManagerImpl::instance()-> - connection_handler().SetHeartBeatTimeout(connection_key, timeout); + application_manager_.connection_handler() + .SetHeartBeatTimeout(connection_key, timeout); } } else { LOG4CXX_INFO(logger_, "Policy is turn off"); |