diff options
author | JackLivio <jack@livio.io> | 2020-06-17 15:08:36 -0400 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2020-06-17 15:08:36 -0400 |
commit | 92cb80d152a23e03f037178e2575a4c462331eb2 (patch) | |
tree | a0d5c00add3e1538fc30b7439b280d180c57ea00 /src/components/application_manager/src/hmi_language_handler.cc | |
parent | 45ad20f9907918aaa937f0915e0dd394badb6a12 (diff) | |
parent | cab7e593787f1f18eb3847aa27bfc9b90c066197 (diff) | |
download | sdl_core-92cb80d152a23e03f037178e2575a4c462331eb2.tar.gz |
Merge remote-tracking branch 'origin/develop' into feature/additional_submenus
# Conflicts:
# src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
# src/components/application_manager/include/application_manager/smart_object_keys.h
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
# src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
# src/components/application_manager/src/hmi_capabilities_impl.cc
# src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
# src/components/include/application_manager/hmi_capabilities.h
# src/components/interfaces/HMI_API.xml
# src/components/interfaces/MOBILE_API.xml
Diffstat (limited to 'src/components/application_manager/src/hmi_language_handler.cc')
-rw-r--r-- | src/components/application_manager/src/hmi_language_handler.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/components/application_manager/src/hmi_language_handler.cc b/src/components/application_manager/src/hmi_language_handler.cc index e206633ae2..46231c4596 100644 --- a/src/components/application_manager/src/hmi_language_handler.cc +++ b/src/components/application_manager/src/hmi_language_handler.cc @@ -35,7 +35,7 @@ #include "application_manager/hmi_capabilities.h" #include "application_manager/message_helper.h" #include "application_manager/rpc_service.h" -#include "resumption/last_state.h" +#include "resumption/last_state_wrapper.h" #include "smart_objects/smart_object.h" #include "utils/helpers.h" @@ -81,9 +81,10 @@ void HMILanguageHandler::set_language_for( LOG4CXX_DEBUG( logger_, "Setting language " << language << " for interface " << interface); - Json::Value& dictionary = last_state_->get_dictionary(); - dictionary[LanguagesKey][key] = language; - return; + resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor(); + Json::Value dictionary = accessor.GetData().dictionary(); + dictionary[LanguagesKey][key] = static_cast<int32_t>(language); + accessor.GetMutableData().set_dictionary(dictionary); } hmi_apis::Common_Language::eType HMILanguageHandler::get_language_for( @@ -107,7 +108,8 @@ hmi_apis::Common_Language::eType HMILanguageHandler::get_language_for( return Common_Language::INVALID_ENUM; } - const Json::Value& dictionary = last_state_->get_dictionary(); + resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor(); + Json::Value dictionary = accessor.GetData().dictionary(); if (dictionary.isMember(LanguagesKey)) { if (dictionary[LanguagesKey].isMember(key)) { Common_Language::eType language = static_cast<Common_Language::eType>( @@ -342,8 +344,8 @@ void HMILanguageHandler::CheckApplication(const Apps::value_type app) { } } -void HMILanguageHandler::Init(resumption::LastState* value) { - last_state_ = value; +void HMILanguageHandler::Init(resumption::LastStateWrapperPtr value) { + last_state_wrapper_ = value; persisted_ui_language_ = get_language_for(INTERFACE_UI); persisted_vr_language_ = get_language_for(INTERFACE_VR); persisted_tts_language_ = get_language_for(INTERFACE_TTS); |