diff options
Diffstat (limited to 'src/components/application_manager/src/resume_ctrl.cpp')
| -rw-r--r-- | src/components/application_manager/src/resume_ctrl.cpp | 1512 |
1 files changed, 936 insertions, 576 deletions
diff --git a/src/components/application_manager/src/resume_ctrl.cpp b/src/components/application_manager/src/resume_ctrl.cpp index cdbd6dc1c..19cad8013 100644 --- a/src/components/application_manager/src/resume_ctrl.cpp +++ b/src/components/application_manager/src/resume_ctrl.cpp @@ -1,6 +1,39 @@ -#include <fstream> - +/* + Copyright (c) 2015, Ford Motor Company + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following + disclaimer in the documentation and/or other materials provided with the + distribution. + + Neither the name of the Ford Motor Company nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + */ #include "application_manager/resume_ctrl.h" + +#include <fstream> +#include <algorithm> + #include "config_profile/profile.h" #include "utils/file_system.h" #include "connection_handler/connection_handler_impl.h" @@ -14,6 +47,7 @@ #include "resumption/last_state.h" #include "policy/policy_manager_impl.h" #include "application_manager/policies/policy_handler.h" +#include "application_manager/state_controller.h" namespace application_manager { @@ -22,103 +56,103 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "ResumeCtrl") namespace Formatters = NsSmartDeviceLink::NsJSONHandler::Formatters; ResumeCtrl::ResumeCtrl(ApplicationManagerImpl* app_mngr) - : app_mngr_(app_mngr), - timer_("ResumeCtrl", this, &ResumeCtrl::onTimer) { + : resumtion_lock_(true), + app_mngr_(app_mngr), + save_persistent_data_timer_("RsmCtrlPercist", + this, &ResumeCtrl::SaveDataOnTimer, true), + restore_hmi_level_timer_("RsmCtrlRstore", + this, &ResumeCtrl::ApplicationResumptiOnTimer), + is_resumption_active_(false), + is_data_saved(true), + launch_time_(time(NULL)) { + LoadResumeData(); + save_persistent_data_timer_.start(profile::Profile::instance()->app_resumption_save_persistent_data_timeout()); } void ResumeCtrl::SaveAllApplications() { - LOG4CXX_INFO(logger_, "ResumeCtrl::SaveApplications()"); - DCHECK(app_mngr_); - - std::set<ApplicationSharedPtr>::iterator it = - app_mngr_->application_list_.begin(); - std::set<ApplicationSharedPtr>::iterator it_end = - app_mngr_->application_list_.end(); - for (; it != it_end; ++it) { - SaveApplication(*it); - } + LOG4CXX_AUTO_TRACE(logger_); + std::set<ApplicationSharedPtr> apps(retrieve_application()); + std::for_each(apps.begin(), + apps.end(), + std::bind1st(std::mem_fun(&ResumeCtrl::SaveApplication), this)); + // remove old } void ResumeCtrl::SaveApplication(ApplicationConstSharedPtr application) { - LOG4CXX_INFO(logger_, "ResumeCtrl::SaveApplication"); - DCHECK(application.get()); - Json::Value* json_app = NULL; - - const std::string& m_app_id = application->mobile_app_id()->asString(); - Json::Value::iterator it = GetSavedApplications().begin(); - for (; it != GetSavedApplications().end(); ++it) { - if (m_app_id == (*it)[strings::app_id].asString()) { - json_app = &(*it); - LOG4CXX_INFO(logger_, "ResumeCtrl Application with this id " - "already exist ( update info )." - "mobile app_id = " << m_app_id); - break; - } - } - - if (json_app == NULL) { - LOG4CXX_INFO(logger_, "ResumeCtrl Application with this ID does not" - "exist. Add new. mobile app_id = " << m_app_id); - json_app = &(GetSavedApplications().append(Json::Value())); + if (!application) { + LOG4CXX_FATAL(logger_, "Application object is NULL."); + return; } - uint32_t hash = application->curHash(); - uint32_t grammar_id = application->get_grammar_id(); - - LOG4CXX_INFO(logger_, "Hash = " << hash); - (*json_app)[strings::device_mac] = - MessageHelper::GetDeviceMacAddressForHandle(application->device()); - (*json_app)[strings::app_id] = m_app_id; - (*json_app)[strings::grammar_id] = grammar_id; - (*json_app)[strings::connection_key] = application->app_id(); - (*json_app)[strings::hmi_app_id] = application->hmi_app_id(); - (*json_app)[strings::hmi_level] = - static_cast<int32_t> (application->hmi_level()); - (*json_app)[strings::ign_off_count] = 0; - (*json_app)[strings::hash_id] = hash; - (*json_app)[strings::application_commands] = - GetApplicationCommands(application); - (*json_app)[strings::application_submenus] = - GetApplicationSubMenus(application); - (*json_app)[strings::application_choise_sets] = - GetApplicationInteractionChoiseSets(application); - (*json_app)[strings::application_global_properties] = - GetApplicationGlobalProperties(application); - (*json_app)[strings::application_subscribtions] = - GetApplicationSubscriptions(application); - (*json_app)[strings::application_files] = GetApplicationFiles(application); - (*json_app)[strings::time_stamp] = (uint32_t)time(NULL); - (*json_app)[strings::audio_streaming_state] = application->audio_streaming_state(); + const std::string& m_app_id = application->mobile_app_id(); + LOG4CXX_TRACE(logger_, "ENTER app_id : " << application->app_id() + << " mobile app_id : " << m_app_id); + + const std::string hash = application->curHash(); // let's make a copy not to depend on application + const uint32_t grammar_id = application->get_grammar_id(); + const uint32_t time_stamp = (uint32_t)time(NULL); + + const mobile_apis::HMILevel::eType hmi_level = application->hmi_level(); + + resumtion_lock_.Acquire(); + Json::Value& json_app = GetFromSavedOrAppend(m_app_id); + + json_app[strings::device_mac] = + MessageHelper::GetDeviceMacAddressForHandle(application->device()); + json_app[strings::app_id] = m_app_id; + json_app[strings::grammar_id] = grammar_id; + json_app[strings::connection_key] = application->app_id(); + json_app[strings::hmi_app_id] = application->hmi_app_id(); + json_app[strings::is_media_application] = application->IsAudioApplication(); + json_app[strings::hmi_level] = static_cast<int32_t> (hmi_level); + json_app[strings::ign_off_count] = 0; + json_app[strings::suspend_count] = 0; + json_app[strings::hash_id] = hash; + json_app[strings::application_commands] = + GetApplicationCommands(application); + json_app[strings::application_submenus] = + GetApplicationSubMenus(application); + json_app[strings::application_choise_sets] = + GetApplicationInteractionChoiseSets(application); + json_app[strings::application_global_properties] = + GetApplicationGlobalProperties(application); + json_app[strings::application_subscribtions] = + GetApplicationSubscriptions(application); + json_app[strings::application_files] = GetApplicationFiles(application); + json_app[strings::time_stamp] = time_stamp; + LOG4CXX_DEBUG(logger_, "SaveApplication : " << json_app.toStyledString()); + + resumtion_lock_.Release(); } void ResumeCtrl::on_event(const event_engine::Event& event) { - LOG4CXX_INFO(logger_, "ResumeCtrl::on_event "); + LOG4CXX_TRACE(logger_, "Response from HMI command"); } -bool ResumeCtrl::RestoreApplicationHMILevel(ApplicationSharedPtr application) { - if (false == application.valid()) { +bool ResumeCtrl::RestoreAppHMIState(ApplicationSharedPtr application) { + LOG4CXX_AUTO_TRACE(logger_); + using namespace mobile_apis; + if (!application) { LOG4CXX_ERROR(logger_, " RestoreApplicationHMILevel() application pointer in invalid"); return false; } - Json::Value::iterator it = GetSavedApplications().begin(); - for (;it != GetSavedApplications().end(); ++it) { - const std::string& saved_m_app_id = (*it)[strings::app_id].asString(); - - if (saved_m_app_id == application->mobile_app_id()->asString()) { - - mobile_apis::HMILevel::eType saved_hmi_level; - //mobile_apis::HMILevel::eType restored_hmi_level; - - mobile_apis::AudioStreamingState::eType audio_streaming_state = - static_cast<mobile_apis::AudioStreamingState::eType> - ((*it)[strings::audio_streaming_state].asInt()); - application->set_audio_streaming_state(audio_streaming_state); - saved_hmi_level = static_cast<mobile_apis::HMILevel::eType>( - (*it)[strings::hmi_level].asInt()); - - return SetupHMILevel(application, saved_hmi_level, audio_streaming_state); + LOG4CXX_DEBUG(logger_, "ENTER app_id : " << application->app_id()); + + sync_primitives::AutoLock lock(resumtion_lock_); + const int idx = GetObjectIndex(application->mobile_app_id()); + if (-1 != idx) { + const Json::Value& json_app = GetSavedApplications()[idx]; + if (json_app.isMember(strings::hmi_level)) { + + const HMILevel::eType saved_hmi_level = + static_cast<mobile_apis::HMILevel::eType>( + json_app[strings::hmi_level].asInt()); + LOG4CXX_DEBUG(logger_, "Saved HMI Level is : " << saved_hmi_level); + return SetAppHMIState(application, saved_hmi_level); + } else { + LOG4CXX_FATAL(logger_, "There are some unknown keys among the stored apps"); } } LOG4CXX_INFO(logger_, "Failed to restore application HMILevel"); @@ -126,52 +160,26 @@ bool ResumeCtrl::RestoreApplicationHMILevel(ApplicationSharedPtr application) { } bool ResumeCtrl::SetupDefaultHMILevel(ApplicationSharedPtr application) { - LOG4CXX_TRACE_ENTER(logger_); - if (false == application.valid()) { - LOG4CXX_ERROR(logger_, "SetupDefaultHMILevel application pointer is invalid"); - return false; - } - - mobile_apis::HMILevel::eType default_hmi = mobile_apis::HMILevel::HMI_NONE; - - if (policy::PolicyHandler::instance()->PolicyEnabled()) { - std::string policy_app_id = application->mobile_app_id()->asString(); - std::string default_hmi_string = ""; - bool result_get_hmi = policy::PolicyHandler::instance()->GetDefaultHmi( - policy_app_id, &default_hmi_string); - if (true == result_get_hmi) { - if ("BACKGROUND" == default_hmi_string) { - default_hmi = mobile_apis::HMILevel::HMI_BACKGROUND; - } else if ("FULL" == default_hmi_string) { - default_hmi = mobile_apis::HMILevel::HMI_FULL; - } else if ("LIMITED" == default_hmi_string) { - default_hmi = mobile_apis::HMILevel::HMI_LIMITED; - } else if ("NONE" == default_hmi_string) { - default_hmi = mobile_apis::HMILevel::HMI_NONE; - } else { - LOG4CXX_ERROR(logger_, "Unable to convert " + default_hmi_string + "to HMILevel"); - return false; - } - } else { - LOG4CXX_ERROR(logger_, "SetupDefaultHMILevel() unable to get default hmi_level for " - << policy_app_id); - } - } - - return SetupHMILevel(application, default_hmi, - mobile_apis::AudioStreamingState::NOT_AUDIBLE, false); + DCHECK_OR_RETURN(application, false); + LOG4CXX_AUTO_TRACE(logger_); + mobile_apis::HMILevel::eType default_hmi = + ApplicationManagerImpl::instance()-> GetDefaultHmiLevel(application); + bool result = SetAppHMIState(application, default_hmi, false); + return result; } -bool ResumeCtrl::SetupHMILevel(ApplicationSharedPtr application, - mobile_apis::HMILevel::eType hmi_level, - mobile_apis::AudioStreamingState::eType audio_streaming_state, +bool ResumeCtrl::SetAppHMIState(ApplicationSharedPtr application, + const mobile_apis::HMILevel::eType hmi_level, bool check_policy) { - + using namespace mobile_apis; + LOG4CXX_AUTO_TRACE(logger_); if (false == application.valid()) { - LOG4CXX_ERROR(logger_, "SetupHMILevel() application pointer in invalid"); + LOG4CXX_ERROR(logger_, "Application pointer in invalid"); return false; } - + LOG4CXX_TRACE(logger_, " app_id : ( " << application->app_id() + << ", hmi_level : " << hmi_level + << ", check_policy : " << check_policy << " )"); const std::string device_id = MessageHelper::GetDeviceMacAddressForHandle(application->device()); @@ -182,336 +190,178 @@ bool ResumeCtrl::SetupHMILevel(ApplicationSharedPtr application, SetupDefaultHMILevel(application); return false; } - + HMILevel::eType restored_hmi_level = hmi_level; if ((hmi_level == application->hmi_level()) && (hmi_level != mobile_apis::HMILevel::HMI_NONE)) { - LOG4CXX_WARN(logger_, "Hmi level " << hmi_level << " should not be set to " - << application->mobile_app_id()->asString() << " " << application->hmi_level()); - + LOG4CXX_DEBUG(logger_, "Hmi level " << hmi_level << " should not be set to " + << application->mobile_app_id() + <<" current hmi_level is " << application->hmi_level()); return false; } - if (mobile_apis::HMILevel::HMI_FULL == hmi_level) { - hmi_level = app_mngr_->PutApplicationInFull(application); - - if ((mobile_apis::HMILevel::HMI_FULL == hmi_level || - mobile_apis::HMILevel::HMI_LIMITED == hmi_level) && - (mobile_apis::AudioStreamingState::AUDIBLE == audio_streaming_state)) { - application->set_audio_streaming_state(audio_streaming_state); - } - } else if (mobile_apis::HMILevel::HMI_LIMITED == hmi_level) { - if ((false == application->IsAudioApplication()) || - app_mngr_->DoesAudioAppWithSameHMITypeExistInFullOrLimited(application)) { - hmi_level = mobile_apis::HMILevel::HMI_BACKGROUND; - } else { - if (audio_streaming_state == mobile_apis::AudioStreamingState::AUDIBLE) { - //implemented SDLAQ-CRS-839 - //checking the existence of application with AudioStreamingState=AUDIBLE - //notification resumeAudioSource is sent if only resumed application has - //AudioStreamingState=AUDIBLE - bool application_exist_with_audible_state = false; - ApplicationManagerImpl::ApplicationListAccessor accessor; - const std::set<ApplicationSharedPtr> app_list = accessor.applications(); - std::set<ApplicationSharedPtr>::const_iterator app_list_it = app_list - .begin(); - uint32_t app_id = application->app_id(); - for (; app_list.end() != app_list_it; ++app_list_it) { - if ((mobile_apis::AudioStreamingState::AUDIBLE == - (*app_list_it)->audio_streaming_state()) - && ((*app_list_it))->app_id() != app_id) { - application_exist_with_audible_state = true; - break; - } - } - if (application_exist_with_audible_state) { - application->set_audio_streaming_state( - mobile_apis::AudioStreamingState::NOT_AUDIBLE); - } else { - MessageHelper::SendOnResumeAudioSourceToHMI(application->app_id()); + if (HMILevel::HMI_FULL == hmi_level) { + restored_hmi_level = app_mngr_->IsHmiLevelFullAllowed(application); + } else if (HMILevel::HMI_LIMITED == hmi_level) { + bool allowed_limited = application->is_media_application(); + ApplicationManagerImpl::ApplicationListAccessor accessor; + ApplicationManagerImpl::ApplictionSetConstIt it = accessor.begin(); + for (; accessor.end() != it && allowed_limited; ++it) { + const ApplicationSharedPtr curr_app = *it; + if (curr_app->is_media_application()) { + if (curr_app->hmi_level() == HMILevel::HMI_FULL || + curr_app->hmi_level() == HMILevel::HMI_LIMITED) { + allowed_limited = false; } } } + if (allowed_limited) { + restored_hmi_level = HMILevel::HMI_LIMITED; + } else { + restored_hmi_level = + ApplicationManagerImpl::instance()->GetDefaultHmiLevel(application); + } } - - if (hmi_level != mobile_apis::HMILevel::HMI_FULL) { - application->set_hmi_level(hmi_level); + if (HMILevel::HMI_LIMITED == restored_hmi_level) { + MessageHelper::SendOnResumeAudioSourceToHMI(application->app_id()); } - MessageHelper::SendHMIStatusNotification(*(application.get())); - + const AudioStreamingState::eType restored_audio_state = + application->is_media_application() && + (HMILevel::HMI_FULL == restored_hmi_level || + HMILevel::HMI_LIMITED == restored_hmi_level) + ? AudioStreamingState::AUDIBLE : AudioStreamingState::NOT_AUDIBLE; + + if (restored_hmi_level == HMILevel::HMI_FULL) { + ApplicationManagerImpl::instance()->SetState<true>(application->app_id(), + restored_hmi_level, + restored_audio_state); + } else { + ApplicationManagerImpl::instance()->SetState<false>(application->app_id(), + restored_hmi_level, + restored_audio_state); + } LOG4CXX_INFO(logger_, "Set up application " - << application->mobile_app_id()->asString() + << application->mobile_app_id() << " to HMILevel " << hmi_level); return true; } bool ResumeCtrl::RestoreApplicationData(ApplicationSharedPtr application) { - LOG4CXX_INFO(logger_, "RestoreApplicationData"); - DCHECK(application.get()); - - Json::Value::iterator it = GetSavedApplications().begin(); - for (; it != GetSavedApplications().end(); ++it) { - const std::string& saved_m_app_id = (*it)[strings::app_id].asString(); - if (saved_m_app_id == application->mobile_app_id()->asString()) { - break; - } - } - - if (it == GetSavedApplications().end()) { - LOG4CXX_WARN(logger_, "Application not saved"); + LOG4CXX_AUTO_TRACE(logger_); + if (!application.valid()) { + LOG4CXX_ERROR(logger_, "Application pointer in invalid"); return false; } - Json::Value& saved_app = *it; - MessageHelper::SmartObjectList requests; - - LOG4CXX_INFO(logger_, saved_app.toStyledString()); - Json::Value& app_commands = saved_app[strings::application_commands]; - Json::Value& app_submenus = saved_app[strings::application_submenus]; - Json::Value& app_choise_sets = saved_app[strings::application_choise_sets]; - Json::Value& global_properties = saved_app[strings::application_global_properties]; - Json::Value& subscribtions = saved_app[strings::application_subscribtions]; - Json::Value& application_files = saved_app[strings::application_files]; - uint32_t app_grammar_id = saved_app[strings::grammar_id].asUInt(); - application->set_grammar_id(app_grammar_id); - - - // files - for (Json::Value::iterator json_it = application_files.begin(); - json_it != application_files.end(); ++json_it) { - Json::Value& file_data = *json_it; - - bool is_persistent = file_data[strings::persistent_file].asBool(); - if (is_persistent) { - AppFile file; - file.is_persistent = is_persistent; - file.is_download_complete = file_data[strings::is_download_complete].asBool(); - file.file_name = file_data[strings::sync_file_name].asString(); - file.file_type = static_cast<mobile_apis::FileType::eType> ( - file_data[strings::file_type].asInt()); - LOG4CXX_INFO(logger_, "RestoreApplicationData file " << file.file_name); - application->AddFile(file); - } - } - - //add submenus - for (Json::Value::iterator json_it = app_submenus.begin(); - json_it != app_submenus.end(); ++json_it) { - Json::Value& json_submenu = *json_it; - smart_objects::SmartObject message = smart_objects::SmartObject( - smart_objects::SmartType::SmartType_Map); - Formatters::CFormatterJsonBase::jsonValueToObj(json_submenu, message); - application->AddSubMenu(message[strings::menu_id].asUInt(), message); - } - requests = MessageHelper::CreateAddSubMenuRequestToHMI(application); - - for (MessageHelper::SmartObjectList::iterator it = requests.begin(); - it != requests.end(); ++it) { - ProcessHMIRequest(*it, true); - } - - //add commands - for (Json::Value::iterator json_it = app_commands.begin(); - json_it != app_commands.end(); ++json_it) { - Json::Value& json_command = *json_it; - smart_objects::SmartObject message = smart_objects::SmartObject( - smart_objects::SmartType::SmartType_Map); - Formatters::CFormatterJsonBase::jsonValueToObj(json_command, message); - application->AddCommand(message[strings::cmd_id].asUInt(), message); - } - - requests = MessageHelper::CreateAddCommandRequestToHMI(application); + LOG4CXX_DEBUG(logger_, "ENTER app_id : " << application->app_id()); - for (MessageHelper::SmartObjectList::iterator it = requests.begin(); - it != requests.end(); ++it) { - ProcessHMIRequest(*it, true); - } - - //add choisets - for (Json::Value::iterator json_it = app_choise_sets.begin(); - json_it != app_choise_sets.end(); ++json_it) { - Json::Value& json_choiset = *json_it; - smart_objects::SmartObject msg_param = smart_objects::SmartObject( - smart_objects::SmartType::SmartType_Map); - Formatters::CFormatterJsonBase::jsonValueToObj(json_choiset , msg_param); - const int32_t choice_set_id = msg_param - [strings::interaction_choice_set_id].asInt(); - uint32_t choice_grammar_id = msg_param[strings::grammar_id].asUInt(); - application->AddChoiceSet(choice_set_id, msg_param); - - for (size_t j = 0; j < msg_param[strings::choice_set].length(); ++j) { - smart_objects::SmartObject choise_params = smart_objects::SmartObject( - smart_objects::SmartType_Map); - choise_params[strings::app_id] = application->app_id(); - choise_params[strings::cmd_id] = - msg_param[strings::choice_set][j][strings::choice_id]; - choise_params[strings::vr_commands] = smart_objects::SmartObject( - smart_objects::SmartType_Array); - choise_params[strings::vr_commands] = - msg_param[strings::choice_set][j][strings::vr_commands]; - - choise_params[strings::type] = hmi_apis::Common_VRCommandType::Choice; - choise_params[strings::grammar_id] = choice_grammar_id; - SendHMIRequest(hmi_apis::FunctionID::VR_AddCommand, &choise_params); - } - } - - //setglobal properties - if (!global_properties.isNull()) { - smart_objects::SmartObject properties_so = smart_objects::SmartObject( - smart_objects::SmartType::SmartType_Map); - Formatters::CFormatterJsonBase::jsonValueToObj(global_properties , properties_so); - - const smart_objects::SmartObject& vr_help_title = - properties_so.getElement(strings::vr_help_title); - if (vr_help_title.getType() != smart_objects::SmartType::SmartType_Invalid && - vr_help_title.getType() != smart_objects::SmartType::SmartType_Null) { - application->set_vr_help_title(vr_help_title); - } - - const smart_objects::SmartObject& vr_help = - properties_so.getElement(strings::vr_help); - if (vr_help.getType() != smart_objects::SmartType::SmartType_Invalid && - vr_help.getType() != smart_objects::SmartType::SmartType_Null) { - application->set_vr_help(vr_help); - } - - const smart_objects::SmartObject& timeout_prompt = - properties_so.getElement(strings::timeout_prompt); - if (timeout_prompt.getType() != smart_objects::SmartType::SmartType_Invalid && - timeout_prompt.getType() != smart_objects::SmartType::SmartType_Null) { - application->set_timeout_prompt(timeout_prompt); - } - - const smart_objects::SmartObject& help_prompt = - properties_so.getElement(strings::help_prompt); - if (help_prompt.getType() != smart_objects::SmartType::SmartType_Invalid && - help_prompt.getType() != smart_objects::SmartType::SmartType_Null) { - application->set_help_prompt(help_prompt); - } - - const smart_objects::SmartObject& keyboard_properties = - properties_so.getElement(strings::keyboard_properties); - if (keyboard_properties.getType() != smart_objects::SmartType::SmartType_Invalid && - keyboard_properties.getType() != smart_objects::SmartType::SmartType_Null) { - application->set_keyboard_props(keyboard_properties); - } - - const smart_objects::SmartObject& menu_title = - properties_so.getElement(strings::menu_title); - if (menu_title.getType() != smart_objects::SmartType::SmartType_Invalid && - menu_title.getType() != smart_objects::SmartType::SmartType_Null) { - application->set_menu_title(menu_title); - } - - const smart_objects::SmartObject& menu_icon = - properties_so.getElement(strings::menu_icon); - if (menu_icon.getType() != smart_objects::SmartType::SmartType_Invalid && - menu_icon.getType() != smart_objects::SmartType::SmartType_Null) { - application->set_menu_icon(menu_icon); - } - - MessageHelper::SendGlobalPropertiesToHMI(application); + sync_primitives::AutoLock lock(resumtion_lock_); + const int idx = GetObjectIndex(application->mobile_app_id()); + if (-1 == idx) { + LOG4CXX_WARN(logger_, "Application not saved"); + return false; } - //subscribes - if (!subscribtions.isNull()) { - Json::Value& subscribtions_buttons = subscribtions[strings::application_buttons]; - Json::Value& subscribtions_ivi= subscribtions[strings::application_vehicle_info]; - for (Json::Value::iterator json_it = subscribtions_buttons.begin(); - json_it != subscribtions_buttons.end(); ++json_it) { - mobile_apis::ButtonName::eType btn; - btn = static_cast<mobile_apis::ButtonName::eType>((*json_it).asInt()); - application->SubscribeToButton(btn); - } - - for (Json::Value::iterator json_it = subscribtions_ivi.begin(); - json_it != subscribtions_ivi.end(); ++json_it) { - VehicleDataType ivi; - ivi = static_cast<VehicleDataType>((*json_it).asInt()); - LOG4CXX_INFO(logger_, "VehicleDataType :" << ivi); -#ifdef ENABLE_LOG - bool result = -#endif - application->SubscribeToIVI(ivi); - LOG4CXX_INFO(logger_, "result = :" << result); - } - requests = MessageHelper::GetIVISubscribtionRequests(application->app_id()); - - for (MessageHelper::SmartObjectList::iterator it = requests.begin(); - it != requests.end(); ++it) { - ProcessHMIRequest(*it,true); - } + const Json::Value& saved_app = GetSavedApplications()[idx]; + if(saved_app.isMember(strings::grammar_id)) { + const uint32_t app_grammar_id = saved_app[strings::grammar_id].asUInt(); + application->set_grammar_id(app_grammar_id); + + AddFiles(application, saved_app); + AddSubmenues(application, saved_app); + AddCommands(application, saved_app); + AddChoicesets(application, saved_app); + SetGlobalProperties(application, saved_app); + AddSubscriptions(application, saved_app); } return true; } bool ResumeCtrl::IsHMIApplicationIdExist(uint32_t hmi_app_id) { - LOG4CXX_INFO(logger_, "ResumeCtrl::IsHMIApplicationIdExist " << hmi_app_id); - + LOG4CXX_TRACE(logger_, "ENTER hmi_app_id :" << hmi_app_id); + sync_primitives::AutoLock lock(resumtion_lock_); for (Json::Value::iterator it = GetSavedApplications().begin(); it != GetSavedApplications().end(); ++it) { - if ((*it)[strings::hmi_app_id].asUInt() == hmi_app_id) { - return true; + if ((*it).isMember(strings::hmi_app_id)) { + if ((*it)[strings::hmi_app_id].asUInt() == hmi_app_id) { + return true; + } } } + ApplicationManagerImpl::ApplicationListAccessor accessor; + ApplicationManagerImpl::ApplictionSet apps(accessor.applications()); + ApplicationManagerImpl::ApplictionSetIt it = apps.begin(); + ApplicationManagerImpl::ApplictionSetIt it_end = apps.end(); - std::set<ApplicationSharedPtr>::iterator it = - app_mngr_->application_list_.begin(); - std::set<ApplicationSharedPtr>::iterator it_end = - app_mngr_->application_list_.end(); for (;it != it_end; ++it) { if (hmi_app_id == (*it)->hmi_app_id()) { + LOG4CXX_TRACE(logger_, "EXIT result = true"); return true; } } - + LOG4CXX_TRACE(logger_, "EXIT result = false"); return false; } bool ResumeCtrl::IsApplicationSaved(const std::string& mobile_app_id) { - bool result = false; - for (Json::Value::iterator it = GetSavedApplications().begin(); - it != GetSavedApplications().end(); ++it) { - if ((*it)[strings::app_id].asString() == mobile_app_id) { - result = true; - } + LOG4CXX_TRACE(logger_, "ENTER mobile_app_id :" << mobile_app_id); + + sync_primitives::AutoLock lock(resumtion_lock_); + int index = GetObjectIndex(mobile_app_id); + if (-1 == index) { + return false; } - LOG4CXX_INFO(logger_, "IsApplicationSaved " << mobile_app_id << " : " << (result?"true":"false")); - return result; + + if (!IsResumptionDataValid(index)) { + LOG4CXX_INFO(logger_, "Resumption data for app " << mobile_app_id << + " is corrupted. Remove application from resumption list"); + RemoveApplicationFromSaved(mobile_app_id); + return false; + } + + return true; } uint32_t ResumeCtrl::GetHMIApplicationID(const std::string& mobile_app_id) { + LOG4CXX_AUTO_TRACE(logger_); uint32_t hmi_app_id = 0; - for (Json::Value::iterator it = GetSavedApplications().begin(); - it != GetSavedApplications().end(); ++it) { - if ((*it)[strings::app_id].asString() == mobile_app_id) { - hmi_app_id = (*it)[strings::hmi_app_id].asUInt(); - } + + sync_primitives::AutoLock lock(resumtion_lock_); + const int idx = GetObjectIndex(mobile_app_id); + if (-1 == idx) { + LOG4CXX_WARN(logger_, "Application not saved"); + return hmi_app_id; } + const Json::Value& json_app = GetSavedApplications()[idx]; + if (json_app.isMember(strings::app_id)) { + hmi_app_id = json_app[strings::hmi_app_id].asUInt(); + } + LOG4CXX_DEBUG(logger_, "hmi_app_id :" << hmi_app_id); return hmi_app_id; } -bool ResumeCtrl::RemoveApplicationFromSaved(ApplicationConstSharedPtr application) { - LOG4CXX_INFO(logger_, "ResumeCtrl::RemoveApplicationFromSaved "); - DCHECK(application.get()); - +bool ResumeCtrl::RemoveApplicationFromSaved(const std::string& mobile_app_id) { + LOG4CXX_TRACE(logger_, "Remove mobile_app_id " << mobile_app_id); + sync_primitives::AutoLock lock(resumtion_lock_); bool result = false; std::vector<Json::Value> temp; for (Json::Value::iterator it = GetSavedApplications().begin(); it != GetSavedApplications().end(); ++it) { - const std::string& saved_m_app_id = (*it)[strings::app_id].asString(); + if ((*it).isMember(strings::app_id)) { + const std::string& saved_m_app_id = (*it)[strings::app_id].asString(); - if (saved_m_app_id != application->mobile_app_id()->asString()) { - temp.push_back((*it)); - } else { - result = true; + if (saved_m_app_id != mobile_app_id) { + temp.push_back((*it)); + } else { + result = true; + } } } if (false == result) { + LOG4CXX_TRACE(logger_, "EXIT result: " << (result ? "true" : "false")); return result; } @@ -520,267 +370,391 @@ bool ResumeCtrl::RemoveApplicationFromSaved(ApplicationConstSharedPtr applicatio it != temp.end(); ++it) { GetSavedApplications().append((*it)); } + LOG4CXX_TRACE(logger_, "EXIT result: " << (result ? "true" : "false")); return result; } -void ResumeCtrl::IgnitionOff() { - LOG4CXX_INFO(logger_, "ResumeCtrl::IgnitionOff()"); - +void ResumeCtrl::Suspend() { + LOG4CXX_AUTO_TRACE(logger_); + StopSavePersistentDataTimer(); + SaveAllApplications(); Json::Value to_save; + sync_primitives::AutoLock lock(resumtion_lock_); for (Json::Value::iterator it = GetSavedApplications().begin(); it != GetSavedApplications().end(); ++it) { - uint32_t ign_off_count = (*it)[strings::ign_off_count].asUInt(); - if (ign_off_count < kApplicationLifes) { - ign_off_count++; - (*it)[strings::ign_off_count] = ign_off_count; - to_save.append(*it); + if ((*it).isMember(strings::suspend_count)) { + const uint32_t suspend_count = (*it)[strings::suspend_count].asUInt(); + (*it)[strings::suspend_count] = suspend_count + 1; + } else { + LOG4CXX_WARN(logger_, "Unknown key among saved applications"); + (*it)[strings::suspend_count] = 1; + } + if ((*it).isMember(strings::ign_off_count)) { + const uint32_t ign_off_count = (*it)[strings::ign_off_count].asUInt(); + if (ign_off_count < kApplicationLifes) { + (*it)[strings::ign_off_count] = ign_off_count + 1; + to_save.append(*it); + } + } else { + LOG4CXX_WARN(logger_, "Unknown key among saved applications"); + (*it)[strings::ign_off_count] = 1; } } SetSavedApplication(to_save); + SetLastIgnOffTime(time(NULL)); + LOG4CXX_DEBUG(logger_, + GetResumptionData().toStyledString()); + resumption::LastState::instance()->SaveToFileSystem(); +} + +void ResumeCtrl::OnAwake() { + LOG4CXX_AUTO_TRACE(logger_); + + sync_primitives::AutoLock lock(resumtion_lock_); + for (Json::Value::iterator it = GetSavedApplications().begin(); + it != GetSavedApplications().end(); ++it) { + if ((*it).isMember(strings::ign_off_count)) { + const uint32_t ign_off_count = (*it)[strings::ign_off_count].asUInt(); + (*it)[strings::ign_off_count] = ign_off_count - 1; + } else { + LOG4CXX_WARN(logger_, "Unknown key among saved applications"); + (*it)[strings::ign_off_count] = 0; + } + } + ResetLaunchTime(); + StartSavePersistentDataTimer(); +} + + + +void ResumeCtrl::StartSavePersistentDataTimer() { + LOG4CXX_AUTO_TRACE(logger_); + if (!save_persistent_data_timer_.isRunning()) { + save_persistent_data_timer_.start( + profile::Profile::instance()->app_resumption_save_persistent_data_timeout()); + } +} + +void ResumeCtrl::StopSavePersistentDataTimer() { + LOG4CXX_AUTO_TRACE(logger_); + if (save_persistent_data_timer_.isRunning()) { + save_persistent_data_timer_.stop(); + } } + bool ResumeCtrl::StartResumption(ApplicationSharedPtr application, - uint32_t hash) { - LOG4CXX_INFO(logger_, "ResumeCtrl::StartResumption"); - if (!application.valid()) { + const std::string& hash) { + LOG4CXX_AUTO_TRACE(logger_); + if (!application) { LOG4CXX_WARN(logger_, "Application not exist"); return false; } - LOG4CXX_INFO(logger_, " app_id = " << application->app_id() + LOG4CXX_DEBUG(logger_, " Resume app_id = " << application->app_id() << " hmi_app_id = " << application->hmi_app_id() - << " mobile_id = " - << application->mobile_app_id()->asString()); + << " mobile_id = " << application->mobile_app_id() + << "received hash = " << hash); - Json::Value::iterator it = GetSavedApplications().begin(); - ApplicationManagerImpl::ApplicationListAccessor accessor; - for (; it != GetSavedApplications().end(); ++it) { - const std::string& saved_m_app_id = (*it)[strings::app_id].asString(); + sync_primitives::AutoLock lock(resumtion_lock_); + const int idx = GetObjectIndex(application->mobile_app_id()); + if (-1 == idx) { + LOG4CXX_WARN(logger_, "Application not saved"); + return false; + } - if (saved_m_app_id == application->mobile_app_id()->asString()) { + const Json::Value& json_app = GetSavedApplications()[idx]; + LOG4CXX_DEBUG(logger_, "Saved_application_data: " << json_app.toStyledString()); + if (json_app.isMember(strings::hash_id) && json_app.isMember(strings::time_stamp)) { + const std::string& saved_hash = json_app[strings::hash_id].asString(); - uint32_t saved_hash = (*it)[strings::hash_id].asUInt(); - uint32_t time_stamp= (*it)[strings::time_stamp].asUInt(); + if (saved_hash == hash) { + RestoreApplicationData(application); + } + application->UpdateHash(); + + queue_lock_.Acquire(); + waiting_for_timer_.push_back(application->app_id()); + queue_lock_.Release(); + if (!is_resumption_active_) { + is_resumption_active_ = true; + restore_hmi_level_timer_.start( + profile::Profile::instance()->app_resuming_timeout()); + } + } else { + LOG4CXX_INFO(logger_, "There are some unknown keys in the dictionary."); + return false; + } - if (hash == saved_hash) { - RestoreApplicationData(application); - } + return true; +} - application->UpdateHash(); - if (!timer_.isRunning() && accessor.applications().size() > 1) { - RestoreApplicationHMILevel(application); - RemoveApplicationFromSaved(application); - } else { - sync_primitives::AutoLock auto_lock(queue_lock_); - SetupDefaultHMILevel(application); - waiting_for_timer_.insert(std::make_pair(application->app_id(), - time_stamp)); - timer_.start(kTimeStep); - } - return true; +void ResumeCtrl::StartAppHmiStateResumption(ApplicationSharedPtr application) { + LOG4CXX_AUTO_TRACE(logger_); + using namespace profile; + using namespace date_time; + DCHECK_OR_RETURN_VOID(application); + const int idx = GetObjectIndex(application->mobile_app_id()); + DCHECK_OR_RETURN_VOID(idx != -1); + const Json::Value& json_app = GetSavedApplications()[idx]; + + if (!json_app.isMember(strings::ign_off_count)) { + LOG4CXX_INFO(logger_, "Do not need to resume application " + << application->app_id()); + SetupDefaultHMILevel(application); + return; + } + + // check if if is resumption during one IGN cycle + const uint32_t ign_off_count = json_app[strings::ign_off_count].asUInt(); + + if (0 == ign_off_count) { + if (CheckAppRestrictions(application, json_app)) { + LOG4CXX_INFO(logger_, "Resume application after short IGN cycle"); + RestoreAppHMIState(application); + RemoveApplicationFromSaved(application->mobile_app_id()); + } else { + LOG4CXX_INFO(logger_, "Do not need to resume application " + << application->app_id()); + } + } else { + if (CheckIgnCycleRestrictions(json_app) && + CheckAppRestrictions(application, json_app)) { + LOG4CXX_INFO(logger_, "Resume application after IGN cycle"); + RestoreAppHMIState(application); + RemoveApplicationFromSaved(application->mobile_app_id()); + } else { + LOG4CXX_INFO(logger_, "Do not need to resume application " + << application->app_id()); } } +} - LOG4CXX_INFO(logger_, "ResumeCtrl::Application wasn't saved"); - MessageHelper::SendHMIStatusNotification(*application); - return false; +std::set<ApplicationSharedPtr> ResumeCtrl::retrieve_application() { + ApplicationManagerImpl::ApplicationListAccessor accessor; + return std::set<ApplicationSharedPtr>(accessor.begin(), accessor.end()); } bool ResumeCtrl::StartResumptionOnlyHMILevel(ApplicationSharedPtr application) { - LOG4CXX_INFO(logger_, "ResumeCtrl::StartResumptionOnlyHMILevel"); + LOG4CXX_AUTO_TRACE(logger_); if (!application.valid()) { - LOG4CXX_WARN(logger_, "Application not exist"); + LOG4CXX_WARN(logger_, "Application do not exists"); return false; } - LOG4CXX_INFO(logger_, "app_id = " << application->app_id() + LOG4CXX_DEBUG(logger_, "ENTER app_id = " << application->app_id() << "mobile_id = " - << application->mobile_app_id()->asString()); + << application->mobile_app_id()); - Json::Value::iterator it = GetSavedApplications().begin(); - ApplicationManagerImpl::ApplicationListAccessor accessor; - for (; it != GetSavedApplications().end(); ++it) { - const std::string& saved_m_app_id = (*it)[strings::app_id].asString(); - if (saved_m_app_id == application->mobile_app_id()->asString()) { - uint32_t time_stamp= (*it)[strings::time_stamp].asUInt(); - if (!timer_.isRunning() && accessor.applications().size() > 1) { - // resume in case there is already registered app - RestoreApplicationHMILevel(application); - RemoveApplicationFromSaved(application); - } else { - sync_primitives::AutoLock auto_lock(queue_lock_); - SetupDefaultHMILevel(application); - waiting_for_timer_.insert(std::make_pair(application->app_id(), - time_stamp)); - // woun't start timer if it is active already - timer_.start(kTimeStep); - } - return true; - } + sync_primitives::AutoLock lock(resumtion_lock_); + const int idx = GetObjectIndex(application->mobile_app_id()); + if (-1 == idx) { + LOG4CXX_WARN(logger_, "Application not saved"); + return false; } - LOG4CXX_INFO(logger_, "ResumeCtrl::Application wasn't saved"); - MessageHelper::SendHMIStatusNotification(*application); - return false; + queue_lock_.Acquire(); + waiting_for_timer_.push_back(application->app_id()); + queue_lock_.Release(); + if (!is_resumption_active_) { + is_resumption_active_ = true; + restore_hmi_level_timer_.start( + profile::Profile::instance()->app_resuming_timeout()); + } + + return true; } bool ResumeCtrl::CheckPersistenceFilesForResumption(ApplicationSharedPtr application) { - LOG4CXX_INFO(logger_, "CheckPersistenceFilesForResumption"); - DCHECK(application.get()); - - Json::Value::iterator it = GetSavedApplications().begin(); - for (; it != GetSavedApplications().end(); ++it) { - const std::string& saved_m_app_id = (*it)[strings::app_id].asString(); + LOG4CXX_AUTO_TRACE(logger_); - if (saved_m_app_id == application->mobile_app_id()->asString()) { - break; - } + if (!application.valid()) { + LOG4CXX_WARN(logger_, "Application do not exists"); + return false; } + LOG4CXX_DEBUG(logger_, "Process app_id = " << application->app_id()); - if (it == GetSavedApplications().end()) { + sync_primitives::AutoLock lock(resumtion_lock_); + const int idx = GetObjectIndex(application->mobile_app_id()); + if (-1 == idx) { LOG4CXX_WARN(logger_, "Application not saved"); return false; } - Json::Value& saved_app = *it; - MessageHelper::SmartObjectList requests; - - LOG4CXX_INFO(logger_, saved_app.toStyledString()); - Json::Value& app_commands = saved_app[strings::application_commands]; - Json::Value& app_choise_sets = saved_app[strings::application_choise_sets]; - - //add commands - for (Json::Value::iterator json_it = app_commands.begin(); - json_it != app_commands.end(); ++json_it) { - Json::Value& json_command = *json_it; - smart_objects::SmartObject message = - smart_objects::SmartObject(smart_objects::SmartType::SmartType_Map); - Formatters::CFormatterJsonBase::jsonValueToObj(json_command, message); - mobile_apis::Result::eType verification_result = - MessageHelper::VerifyImageFiles(message, application); - if (verification_result == mobile_apis::Result::INVALID_DATA) { - LOG4CXX_WARN(logger_, "app_commands missed icons"); + const Json::Value& saved_app = GetSavedApplications()[idx]; + + if (!saved_app.isMember(strings::application_commands) || + !saved_app.isMember(strings::application_choise_sets)) { + LOG4CXX_WARN(logger_, "application_commands or " + "application_choise_sets are not exists"); return false; } - } - //add choice sets - for (Json::Value::iterator json_it = app_choise_sets.begin(); - json_it != app_choise_sets.end(); ++json_it) { - Json::Value& json_choiset = *json_it; - smart_objects::SmartObject msg_param = - smart_objects::SmartObject(smart_objects::SmartType::SmartType_Map); - Formatters::CFormatterJsonBase::jsonValueToObj(json_choiset , msg_param); - mobile_apis::Result::eType verification_result = - MessageHelper::VerifyImageFiles(msg_param, application); - if (verification_result == mobile_apis::Result::INVALID_DATA) { - LOG4CXX_WARN(logger_, "app_choise_sets missed icons"); + if (!CheckIcons(application, saved_app[strings::application_commands])) { return false; } - } - + if (!CheckIcons(application, saved_app[strings::application_choise_sets])) { + return false; + } + LOG4CXX_DEBUG(logger_, " result = true"); return true; } bool ResumeCtrl::CheckApplicationHash(ApplicationSharedPtr application, - uint32_t hash) { - Json::Value::iterator it = GetSavedApplications().begin(); - for (; it != GetSavedApplications().end(); ++it) { - std::string saved_m_app_id = (*it)[strings::app_id].asString(); - - if (saved_m_app_id == application->mobile_app_id()->asString()) { - uint32_t saved_hash = (*it)[strings::hash_id].asUInt(); - LOG4CXX_INFO(logger_, "received hash = " << hash); - LOG4CXX_INFO(logger_, "saved hash = " << saved_hash); - if (hash == saved_hash) { - return true; - } - } + const std::string& hash) { + if (!application) { + LOG4CXX_ERROR(logger_, "Application pointer is invalid"); + return false; } - return false; -} + LOG4CXX_DEBUG(logger_, "ENTER app_id : " << application->app_id() + << " hash : " << hash); -void ResumeCtrl::onTimer() { - LOG4CXX_INFO(logger_, "ResumeCtrl::onTimer() size is " - << waiting_for_timer_.size()); - sync_primitives::AutoLock auto_lock(queue_lock_); + sync_primitives::AutoLock lock(resumtion_lock_); + const int idx = GetObjectIndex(application->mobile_app_id()); + if (-1 == idx) { + LOG4CXX_WARN(logger_, "Application not saved"); + return false; + } - std::multiset<application_timestamp, TimeStampComparator>::iterator it= - waiting_for_timer_.begin(); + const Json::Value& json_app = GetSavedApplications()[idx]; - for (; it != waiting_for_timer_.end(); ++it) { - ApplicationSharedPtr app = - ApplicationManagerImpl::instance()->application((*it).first); - if (!app.get()) { - LOG4CXX_ERROR(logger_, "Invalid app_id = " << (*it).first); - continue; + if (json_app.isMember(strings::hash_id)) { + const std::string& saved_hash = json_app[strings::hash_id].asString(); + + LOG4CXX_TRACE(logger_, "Found saved application : " << json_app.toStyledString()); + LOG4CXX_INFO(logger_, "received hash = " << hash); + LOG4CXX_INFO(logger_, "saved hash = " << saved_hash); + if (hash == saved_hash) { + return true; } + } + + return false; +} - RestoreApplicationHMILevel(app); - RemoveApplicationFromSaved(app); +void ResumeCtrl::SaveDataOnTimer() { + LOG4CXX_AUTO_TRACE(logger_); + if (is_resumption_active_) { + LOG4CXX_WARN(logger_, "Resumption timer is active skip saving"); + return; } - waiting_for_timer_.clear(); + if (false == is_data_saved) { + SaveAllApplications(); + is_data_saved = true; + resumption::LastState::instance()->SaveToFileSystem(); + } } bool ResumeCtrl::IsDeviceMacAddressEqual(ApplicationSharedPtr application, const std::string& saved_device_mac) { const std::string device_mac = MessageHelper::GetDeviceMacAddressForHandle(application->device()); - return device_mac == saved_device_mac; } +Json::Value&ResumeCtrl::GetResumptionData() { + LOG4CXX_AUTO_TRACE(logger_); + Json::Value& last_state = resumption::LastState::instance()->dictionary; + if (!last_state.isMember(strings::resumption)) { + last_state[strings::resumption] = Json::Value(Json::objectValue); + LOG4CXX_WARN(logger_, "resumption section is missed"); + } + Json::Value& resumption = last_state[strings::resumption]; + if (!resumption.isObject()) { + LOG4CXX_ERROR(logger_, "resumption type INVALID rewrite"); + resumption = Json::Value(Json::objectValue); + } + return resumption; +} + Json::Value& ResumeCtrl::GetSavedApplications() { - return resumption::LastState::instance()->dictionary[strings::resumption]; + LOG4CXX_AUTO_TRACE(logger_); + Json::Value& resumption = GetResumptionData(); + if (!resumption.isMember(strings::resume_app_list)) { + resumption[strings::resume_app_list] = Json::Value(Json::arrayValue); + LOG4CXX_WARN(logger_, "app_list section is missed"); + } + Json::Value& resume_app_list = resumption[strings::resume_app_list]; + if (!resume_app_list.isArray()) { + LOG4CXX_ERROR(logger_, "resume_app_list type INVALID rewrite"); + resume_app_list = Json::Value(Json::arrayValue); + } + return resume_app_list; +} + +time_t ResumeCtrl::GetIgnOffTime() { + LOG4CXX_AUTO_TRACE(logger_); + Json::Value& resumption = GetResumptionData(); + if (!resumption.isMember(strings::last_ign_off_time)) { + resumption[strings::last_ign_off_time] = 0; + LOG4CXX_WARN(logger_, "last_save_time section is missed"); + } + time_t last_ign_off = static_cast<time_t>( + resumption[strings::last_ign_off_time].asUInt()); + return last_ign_off; } +void ResumeCtrl::SetLastIgnOffTime(time_t ign_off_time) { + LOG4CXX_AUTO_TRACE(logger_); + LOG4CXX_WARN(logger_, "ign_off_time = " << ign_off_time); + Json::Value& resumption = GetResumptionData(); + resumption[strings::last_ign_off_time] = static_cast<uint32_t>(ign_off_time); +} + + void ResumeCtrl::SetSavedApplication(Json::Value& apps_json) { - resumption::LastState::instance()->dictionary[strings::resumption] = apps_json ; + Json::Value& app_list = GetSavedApplications(); + app_list = apps_json; } void ResumeCtrl::ClearResumptionInfo() { - Json::Value empty_json; + LOG4CXX_AUTO_TRACE(logger_); + Json::Value empty_json; - SetSavedApplication(empty_json); - resumption::LastState::instance()->SaveToFileSystem(); + SetSavedApplication(empty_json); + resumption::LastState::instance()->SaveToFileSystem(); } Json::Value ResumeCtrl::GetApplicationCommands( ApplicationConstSharedPtr application) { - DCHECK(application.get()); - LOG4CXX_INFO(logger_, "ResumeCtrl::GetApplicationCommands " - << application->app_id()); - + LOG4CXX_AUTO_TRACE(logger_); Json::Value result; - const CommandsMap& commands = application->commands_map(); + DCHECK(application.get()); + if (!application) { + LOG4CXX_ERROR(logger_, "NULL Pointer App"); + return result; + } + const DataAccessor<CommandsMap> accessor = application->commands_map(); + const CommandsMap& commands = accessor.GetData(); CommandsMap::const_iterator it = commands.begin(); for (;it != commands.end(); ++it) { smart_objects::SmartObject* so = it->second; Json::Value curr; Formatters::CFormatterJsonBase::objToJsonValue(*so, curr); result.append(curr); - LOG4CXX_INFO(logger_, "Converted:" << curr.toStyledString()); } return result; } Json::Value ResumeCtrl::GetApplicationSubMenus( ApplicationConstSharedPtr application) { - DCHECK(application.get()); - LOG4CXX_INFO(logger_, "ResumeCtrl::GetApplicationCommands " - << application->app_id()); - + LOG4CXX_AUTO_TRACE(logger_); Json::Value result; - const SubMenuMap& sub_menus = application->sub_menu_map(); + DCHECK(application.get()); + if (!application) { + LOG4CXX_ERROR(logger_, "NULL Pointer App"); + return result; + } + const DataAccessor<SubMenuMap> accessor = application->sub_menu_map(); + const SubMenuMap& sub_menus = accessor.GetData(); SubMenuMap::const_iterator it = sub_menus.begin(); for (;it != sub_menus.end(); ++it) { smart_objects::SmartObject* so = it->second; Json::Value curr; Formatters::CFormatterJsonBase::objToJsonValue(*so, curr); result.append(curr); - LOG4CXX_INFO(logger_, "Converted:" << curr.toStyledString()); } return result; } @@ -788,29 +762,32 @@ Json::Value ResumeCtrl::GetApplicationSubMenus( Json::Value ResumeCtrl::GetApplicationInteractionChoiseSets( ApplicationConstSharedPtr application) { DCHECK(application.get()); - LOG4CXX_INFO(logger_, "ResumeCtrl::GetApplicationInteractionChoiseSets " + LOG4CXX_TRACE(logger_, "ENTER app_id:" << application->app_id()); Json::Value result; - const ChoiceSetMap& choices = application->choice_set_map(); + const DataAccessor<ChoiceSetMap> accessor = application->choice_set_map(); + const ChoiceSetMap& choices = accessor.GetData(); ChoiceSetMap::const_iterator it = choices.begin(); for ( ;it != choices.end(); ++it) { smart_objects::SmartObject* so = it->second; Json::Value curr; Formatters::CFormatterJsonBase::objToJsonValue(*so, curr); result.append(curr); - LOG4CXX_INFO(logger_, "Converted:" << curr.toStyledString()); } return result; } Json::Value ResumeCtrl::GetApplicationGlobalProperties( ApplicationConstSharedPtr application) { + LOG4CXX_AUTO_TRACE(logger_); + Json::Value sgp; DCHECK(application.get()); - LOG4CXX_INFO(logger_, "ResumeCtrl::GetApplicationGlobalProperties " - << application->app_id()); + if (!application) { + LOG4CXX_ERROR(logger_, "NULL Pointer App"); + return sgp; + } - Json::Value result; const smart_objects::SmartObject* help_promt = application->help_prompt(); const smart_objects::SmartObject* timeout_prompt = application->timeout_prompt(); const smart_objects::SmartObject* vr_help = application->vr_help(); @@ -820,7 +797,6 @@ Json::Value ResumeCtrl::GetApplicationGlobalProperties( const smart_objects::SmartObject* menu_title = application->menu_title(); const smart_objects::SmartObject* menu_icon = application->menu_icon(); - Json::Value sgp; sgp[strings::help_prompt] = JsonFromSO(help_promt); sgp[strings::timeout_prompt] = JsonFromSO(timeout_prompt); sgp[strings::vr_help] = JsonFromSO(vr_help); @@ -829,35 +805,34 @@ Json::Value ResumeCtrl::GetApplicationGlobalProperties( sgp[strings::keyboard_properties] = JsonFromSO(keyboard_props); sgp[strings::menu_title] = JsonFromSO(menu_title); sgp[strings::menu_icon] = JsonFromSO(menu_icon); - return sgp; } Json::Value ResumeCtrl::GetApplicationSubscriptions( ApplicationConstSharedPtr application) { - DCHECK(application.get()); - LOG4CXX_INFO(logger_, "ResumeCtrl::GetApplicationSubscriptions " - << application->app_id()); - + LOG4CXX_AUTO_TRACE(logger_); Json::Value result; - std::set<mobile_apis::ButtonName::eType>::iterator it_button ; - std::set<uint32_t>::iterator it_vehicle; - - for (it_button = application->SubscribedButtons().begin() ; - it_button != application->SubscribedButtons().end(); ++it_button) { - result[strings::application_buttons].append(*it_button); - } - for (it_vehicle = application->SubscribesIVI().begin(); - it_vehicle != application->SubscribesIVI().end(); ++it_vehicle) { - result[strings::application_vehicle_info].append(*it_vehicle); + DCHECK(application.get()); + if (!application) { + LOG4CXX_ERROR(logger_, "NULL Pointer App"); + return result; } + LOG4CXX_DEBUG(logger_, "app_id:" << application->app_id()); + LOG4CXX_DEBUG(logger_, "SubscribedButtons:" << application->SubscribedButtons().size()); + Append(application->SubscribedButtons().begin(), + application->SubscribedButtons().end(), + strings::application_buttons, result); + LOG4CXX_DEBUG(logger_, "SubscribesIVI:" << application->SubscribesIVI().size()); + Append(application->SubscribesIVI().begin(), + application->SubscribesIVI().end(), + strings::application_vehicle_info, result); return result; } Json::Value ResumeCtrl::GetApplicationFiles( ApplicationConstSharedPtr application) { DCHECK(application.get()); - LOG4CXX_INFO(logger_, "ResumeCtrl::GetApplicationFiles " + LOG4CXX_TRACE(logger_, "ENTER app_id:" << application->app_id()); Json::Value result; @@ -880,8 +855,8 @@ Json::Value ResumeCtrl::GetApplicationFiles( Json::Value ResumeCtrl::GetApplicationShow( ApplicationConstSharedPtr application) { DCHECK(application.get()); - LOG4CXX_INFO(logger_, "ResumeCtrl::GetApplicationShow " - << application->app_id()); + LOG4CXX_TRACE(logger_, "ENTER app_id:" + << application->app_id()); Json::Value result; const smart_objects::SmartObject* show_so = application->show_command(); @@ -900,8 +875,9 @@ Json::Value ResumeCtrl::JsonFromSO(const smart_objects::SmartObject *so) { return temp; } -bool ResumeCtrl::ProcessHMIRequest(smart_objects::SmartObject* request, +bool ResumeCtrl::ProcessHMIRequest(smart_objects::SmartObjectSPtr request, bool use_events) { + LOG4CXX_AUTO_TRACE(logger_); if (use_events) { const hmi_apis::FunctionID::eType function_id = static_cast<hmi_apis::FunctionID::eType>( @@ -918,14 +894,397 @@ bool ResumeCtrl::ProcessHMIRequest(smart_objects::SmartObject* request, return false; } -void ResumeCtrl::SendHMIRequest( +void ResumeCtrl::AddFiles(ApplicationSharedPtr application, const Json::Value& saved_app) { + LOG4CXX_AUTO_TRACE(logger_); + if (saved_app.isMember(strings::application_files)) { + const Json::Value& application_files = saved_app[strings::application_files]; + for (Json::Value::iterator json_it = application_files.begin(); + json_it != application_files.end(); ++json_it) { + const Json::Value& file_data = *json_it; + + const bool is_persistent = file_data.isMember(strings::persistent_file) && + file_data[strings::persistent_file].asBool(); + if (is_persistent) { + AppFile file; + file.is_persistent = is_persistent; + file.is_download_complete = file_data[strings::is_download_complete].asBool(); + file.file_name = file_data[strings::sync_file_name].asString(); + file.file_type = static_cast<mobile_apis::FileType::eType> ( + file_data[strings::file_type].asInt()); + application->AddFile(file); + } + } + } else { + LOG4CXX_FATAL(logger_, "application_files section is not exists"); + } +} + +void ResumeCtrl::AddSubmenues(ApplicationSharedPtr application, const Json::Value& saved_app) { + LOG4CXX_AUTO_TRACE(logger_); + if (saved_app.isMember(strings::application_submenus)) { + const Json::Value& app_submenus = saved_app[strings::application_submenus]; + for (Json::Value::iterator json_it = app_submenus.begin(); + json_it != app_submenus.end(); ++json_it) { + const Json::Value& json_submenu = *json_it; + smart_objects::SmartObject message(smart_objects::SmartType::SmartType_Map); + Formatters::CFormatterJsonBase::jsonValueToObj(json_submenu, message); + application->AddSubMenu(message[strings::menu_id].asUInt(), message); + } + + ProcessHMIRequests(MessageHelper::CreateAddSubMenuRequestToHMI(application)); + } else { + LOG4CXX_FATAL(logger_, "application_submenus section is not exists"); + } +} + +void ResumeCtrl::AddCommands(ApplicationSharedPtr application, const Json::Value& saved_app) { + LOG4CXX_AUTO_TRACE(logger_); + if (saved_app.isMember(strings::application_commands)) { + const Json::Value& app_commands = saved_app[strings::application_commands]; + for (Json::Value::iterator json_it = app_commands.begin(); + json_it != app_commands.end(); ++json_it) { + const Json::Value& json_command = *json_it; + smart_objects::SmartObject message(smart_objects::SmartType::SmartType_Map); + Formatters::CFormatterJsonBase::jsonValueToObj(json_command, message); + application->AddCommand(message[strings::cmd_id].asUInt(), message); + } + + ProcessHMIRequests(MessageHelper::CreateAddCommandRequestToHMI(application)); + } else { + LOG4CXX_FATAL(logger_, "application_commands section is not exists"); + } +} + +void ResumeCtrl::AddChoicesets(ApplicationSharedPtr application, const Json::Value& saved_app) { + LOG4CXX_AUTO_TRACE(logger_); + if (saved_app.isMember(strings::application_choise_sets)) { + const Json::Value& app_choise_sets = saved_app[strings::application_choise_sets]; + for (Json::Value::iterator json_it = app_choise_sets.begin(); + json_it != app_choise_sets.end(); ++json_it) { + const Json::Value& json_choiset = *json_it; + smart_objects::SmartObject msg_param(smart_objects::SmartType::SmartType_Map); + Formatters::CFormatterJsonBase::jsonValueToObj(json_choiset , msg_param); + const int32_t choice_set_id = msg_param + [strings::interaction_choice_set_id].asInt(); + uint32_t choice_grammar_id = msg_param[strings::grammar_id].asUInt(); + application->AddChoiceSet(choice_set_id, msg_param); + + const size_t size = msg_param[strings::choice_set].length(); + for (size_t j = 0; j < size; ++j) { + smart_objects::SmartObject choise_params(smart_objects::SmartType_Map); + choise_params[strings::app_id] = application->app_id(); + choise_params[strings::cmd_id] = + msg_param[strings::choice_set][j][strings::choice_id]; + choise_params[strings::vr_commands] = smart_objects::SmartObject( + smart_objects::SmartType_Array); + choise_params[strings::vr_commands] = + msg_param[strings::choice_set][j][strings::vr_commands]; + + choise_params[strings::type] = hmi_apis::Common_VRCommandType::Choice; + choise_params[strings::grammar_id] = choice_grammar_id; + SendHMIRequest(hmi_apis::FunctionID::VR_AddCommand, &choise_params); + } + } + } else { + LOG4CXX_FATAL(logger_, "There is no any choicesets"); + } +} + +void ResumeCtrl::SetGlobalProperties(ApplicationSharedPtr application, const Json::Value& saved_app) { + LOG4CXX_AUTO_TRACE(logger_); + const Json::Value& global_properties = saved_app[strings::application_global_properties]; + if (!global_properties.isNull()) { + smart_objects::SmartObject properties_so(smart_objects::SmartType::SmartType_Map); + Formatters::CFormatterJsonBase::jsonValueToObj(global_properties , properties_so); + application->load_global_properties(properties_so); + MessageHelper::SendGlobalPropertiesToHMI(application); + } +} + +void ResumeCtrl::AddSubscriptions(ApplicationSharedPtr application, const Json::Value& saved_app) { + LOG4CXX_AUTO_TRACE(logger_); + if (saved_app.isMember(strings::application_subscribtions)) { + const Json::Value& subscribtions = saved_app[strings::application_subscribtions]; + + if (subscribtions.isMember(strings::application_buttons)) { + const Json::Value& subscribtions_buttons = subscribtions[strings::application_buttons]; + mobile_apis::ButtonName::eType btn; + for (Json::Value::iterator json_it = subscribtions_buttons.begin(); + json_it != subscribtions_buttons.end(); ++json_it) { + btn = static_cast<mobile_apis::ButtonName::eType>((*json_it).asInt()); + application->SubscribeToButton(btn); + } + } + if (subscribtions.isMember(strings::application_vehicle_info)) { + const Json::Value& subscribtions_ivi= subscribtions[strings::application_vehicle_info]; + VehicleDataType ivi; + for (Json::Value::iterator json_it = subscribtions_ivi.begin(); + json_it != subscribtions_ivi.end(); ++json_it) { + ivi = static_cast<VehicleDataType>((*json_it).asInt()); + application->SubscribeToIVI(ivi); + } + } + ProcessHMIRequests(MessageHelper::GetIVISubscriptionRequests(application)); + MessageHelper::SendAllOnButtonSubscriptionNotificationsForApp(application); + } +} + +void ResumeCtrl::ProcessHMIRequests(const smart_objects::SmartObjectList& requests) { + for (smart_objects::SmartObjectList::const_iterator it = requests.begin(), + total = requests.end(); + it != total; ++it) { + ProcessHMIRequest(*it, true); + } +} + +bool ResumeCtrl::CheckIcons(ApplicationSharedPtr application, + const Json::Value& json_object) { + LOG4CXX_AUTO_TRACE(logger_); + bool result = true; + if (!json_object.isNull()) { + Json::Value::const_iterator json_it = json_object.begin(); + for (;json_it != json_object.end() && result; ++json_it) { + const Json::Value& json_command = *json_it; + if (!json_command.isNull()) { + smart_objects::SmartObject message(smart_objects::SmartType::SmartType_Map); + Formatters::CFormatterJsonBase::jsonValueToObj(json_command, message); + const mobile_apis::Result::eType verify_images = + MessageHelper::VerifyImageFiles(message, application); + result = (mobile_apis::Result::INVALID_DATA != verify_images); + } else { + LOG4CXX_WARN(logger_, "Invalid json object"); + } + } + } else { + LOG4CXX_WARN(logger_, "Passed json object is null"); + } + LOG4CXX_DEBUG(logger_, "CheckIcons result " << result); + return result; +} + +Json::Value& ResumeCtrl::GetFromSavedOrAppend(const std::string& mobile_app_id) { + LOG4CXX_AUTO_TRACE(logger_); + for (Json::Value::iterator it = GetSavedApplications().begin(); + it != GetSavedApplications().end(); ++it) { + if (mobile_app_id == (*it)[strings::app_id].asString()) { + return *it; + } + } + + return GetSavedApplications().append(Json::Value()); +} + +bool ResumeCtrl::CheckIgnCycleRestrictions(const Json::Value& json_app) { + LOG4CXX_AUTO_TRACE(logger_); + bool result = true; + + if (!CheckDelayAfterIgnOn()) { + LOG4CXX_INFO(logger_, "Application was connected long after ign on"); + result = false; + } + + if (!DisconnectedJustBeforeIgnOff(json_app)) { + LOG4CXX_INFO(logger_, "Application was dissconnected long before ign off"); + result = false; + } + return result; +} + +bool ResumeCtrl::DisconnectedInLastIgnCycle(const Json::Value& json_app) { + LOG4CXX_AUTO_TRACE(logger_); + DCHECK_OR_RETURN(json_app.isMember(strings::suspend_count), false); + const uint32_t suspend_count = json_app[strings::suspend_count].asUInt(); + LOG4CXX_DEBUG(logger_, " suspend_count " << suspend_count); + return (1 == suspend_count); +} + +bool ResumeCtrl::DisconnectedJustBeforeIgnOff(const Json::Value& json_app) { + using namespace date_time; + using namespace profile; + LOG4CXX_AUTO_TRACE(logger_); + DCHECK_OR_RETURN(json_app.isMember(strings::time_stamp), false); + + const time_t time_stamp = + static_cast<time_t>(json_app[strings::time_stamp].asUInt()); + time_t ign_off_time = GetIgnOffTime(); + const uint32_t sec_spent_before_ign = labs(ign_off_time - time_stamp); + LOG4CXX_DEBUG(logger_,"ign_off_time " << ign_off_time + << "; app_disconnect_time " << time_stamp + << "; sec_spent_before_ign " << sec_spent_before_ign + << "; resumption_delay_before_ign " << + Profile::instance()->resumption_delay_before_ign()); + return sec_spent_before_ign <= + Profile::instance()->resumption_delay_before_ign(); +} + +bool ResumeCtrl::CheckDelayAfterIgnOn() { + using namespace date_time; + using namespace profile; + LOG4CXX_AUTO_TRACE(logger_); + time_t curr_time = time(NULL); + time_t sdl_launch_time = launch_time(); + const uint32_t seconds_from_sdl_start = labs(curr_time - sdl_launch_time); + const uint32_t wait_time = + Profile::instance()->resumption_delay_after_ign(); + LOG4CXX_DEBUG(logger_, "curr_time " << curr_time + << "; sdl_launch_time " << sdl_launch_time + << "; seconds_from_sdl_start " << seconds_from_sdl_start + << "; wait_time " << wait_time); + return seconds_from_sdl_start <= wait_time; +} + +bool ResumeCtrl::CheckAppRestrictions(ApplicationSharedPtr application, + const Json::Value& json_app) { + using namespace mobile_apis; + LOG4CXX_AUTO_TRACE(logger_); + DCHECK_OR_RETURN(json_app.isMember(strings::hmi_level), false); + + const bool is_media_app = application->is_media_application(); + const HMILevel::eType hmi_level = + static_cast<HMILevel::eType>(json_app[strings::hmi_level].asInt()); + LOG4CXX_DEBUG(logger_, "is_media_app " << is_media_app + << "; hmi_level " << hmi_level); + + if (is_media_app) { + if (hmi_level == HMILevel::HMI_FULL || + hmi_level == HMILevel::HMI_LIMITED) { + return true; + } + } + return false; +} + +int ResumeCtrl::GetObjectIndex(const std::string& mobile_app_id) { + LOG4CXX_AUTO_TRACE(logger_); + + sync_primitives::AutoLock lock(resumtion_lock_); + const Json::Value& apps = GetSavedApplications(); + const Json::ArrayIndex size = apps.size(); + Json::ArrayIndex idx = 0; + for (; idx != size; ++idx) { + const std::string& saved_app_id = apps[idx][strings::app_id].asString(); + if (mobile_app_id == saved_app_id) { + LOG4CXX_DEBUG(logger_, "Found " << idx); + return idx; + } + } + return -1; +} +time_t ResumeCtrl::launch_time() const { + return launch_time_; +} + +void ResumeCtrl::ResetLaunchTime() { + launch_time_ = time(NULL); +} + +void ResumeCtrl::ApplicationResumptiOnTimer() { + LOG4CXX_AUTO_TRACE(logger_); + sync_primitives::AutoLock auto_lock(queue_lock_); + is_resumption_active_ = false; + std::vector<uint32_t>::iterator it = waiting_for_timer_.begin(); + + for (; it != waiting_for_timer_.end(); ++it) { + ApplicationSharedPtr app = + ApplicationManagerImpl::instance()->application(*it); + if (!app.get()) { + LOG4CXX_ERROR(logger_, "Invalid app_id = " << *it); + continue; + } + + StartAppHmiStateResumption(app); + } + + waiting_for_timer_.clear(); +} + +void ResumeCtrl::LoadResumeData() { + LOG4CXX_AUTO_TRACE(logger_); + + sync_primitives::AutoLock lock(resumtion_lock_); + + Json::Value& resume_app_list = GetSavedApplications(); + Json::Value::iterator full_app = resume_app_list.end(); + time_t time_stamp_full = 0; + Json::Value::iterator limited_app = resume_app_list.end(); + time_t time_stamp_limited = 0; + + Json::Value::iterator it = resume_app_list.begin(); + for (; it != resume_app_list.end(); ++it) { + if ((*it).isMember(strings::ign_off_count) && + (*it).isMember(strings::hmi_level)) { + + // only apps with first IGN should be resumed + const int32_t first_ign = 1; + if (first_ign == (*it)[strings::ign_off_count].asInt()) { + + const mobile_apis::HMILevel::eType saved_hmi_level = + static_cast<mobile_apis::HMILevel::eType>((*it)[strings::hmi_level].asInt()); + + const time_t saved_time_stamp = + static_cast<time_t>((*it)[strings::time_stamp].asUInt()); + + if (mobile_apis::HMILevel::HMI_FULL == saved_hmi_level) { + if (time_stamp_full < saved_time_stamp) { + time_stamp_full = saved_time_stamp; + full_app = it; + } + } + + if (mobile_apis::HMILevel::HMI_LIMITED == saved_hmi_level) { + if (time_stamp_limited < saved_time_stamp) { + time_stamp_limited = saved_time_stamp; + limited_app = it; + } + } + } + + // set invalid HMI level for all + (*it)[strings::hmi_level] = + static_cast<int32_t>(mobile_apis::HMILevel::INVALID_ENUM); + } + } + + if (full_app != resume_app_list.end()) { + (*full_app)[strings::hmi_level] = + static_cast<int32_t>(mobile_apis::HMILevel::HMI_FULL); + } + + if (limited_app != resume_app_list.end()) { + (*limited_app)[strings::hmi_level] = + static_cast<int32_t>(mobile_apis::HMILevel::HMI_LIMITED); + } + LOG4CXX_DEBUG(logger_, GetResumptionData().toStyledString()); +} + +bool ResumeCtrl::IsResumptionDataValid(uint32_t index) { + const Json::Value& json_app = GetSavedApplications()[index]; + if (!json_app.isMember(strings::app_id) || + !json_app.isMember(strings::ign_off_count) || + !json_app.isMember(strings::hmi_level) || + !json_app.isMember(strings::hmi_app_id) || + !json_app.isMember(strings::time_stamp)) { + LOG4CXX_ERROR(logger_, "Wrong resumption data"); + return false; + } + + if (json_app.isMember(strings::hmi_app_id) && + 0 >= json_app[strings::hmi_app_id].asUInt()) { + LOG4CXX_ERROR(logger_, "Wrong resumption hmi app ID"); + return false; + } + + return true; +} + +uint32_t ResumeCtrl::SendHMIRequest( const hmi_apis::FunctionID::eType& function_id, const smart_objects::SmartObject* msg_params, bool use_events) { - - NsSmartDeviceLink::NsSmartObjects::SmartObject* result = + LOG4CXX_AUTO_TRACE(logger_); + smart_objects::SmartObjectSPtr result = MessageHelper::CreateModuleInfoSO(function_id); - int32_t hmi_correlation_id = - (*result)[strings::params][strings::correlation_id].asInt(); + uint32_t hmi_correlation_id = + (*result)[strings::params][strings::correlation_id].asUInt(); if (use_events) { subscribe_on_event(function_id, hmi_correlation_id); } @@ -937,6 +1296,7 @@ void ResumeCtrl::SendHMIRequest( if (!ApplicationManagerImpl::instance()->ManageHMICommand(result)) { LOG4CXX_ERROR(logger_, "Unable to send request"); } + return hmi_correlation_id; } } // namespace application_manager |