diff options
Diffstat (limited to 'src/components/application_manager/include/application_manager/resumption/resumption_data_json.h')
-rw-r--r-- | src/components/application_manager/include/application_manager/resumption/resumption_data_json.h | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h b/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h index e2418fd033..2394fe00dc 100644 --- a/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h +++ b/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h @@ -35,7 +35,7 @@ #include "application_manager/resumption/resumption_data.h" #include "json/json.h" -#include "resumption/last_state.h" +#include "resumption/last_state_wrapper.h" namespace resumption { @@ -49,7 +49,12 @@ class ResumptionDataJson : public ResumptionData { * @brief Constructor of ResumptionDataJson */ ResumptionDataJson( - LastState& last_state, + resumption::LastStateWrapperPtr last_state_wrapper, + const application_manager::ApplicationManager& application_manager); + + DEPRECATED + ResumptionDataJson( + LastState&, const application_manager::ApplicationManager& application_manager); /** @@ -175,9 +180,8 @@ class ResumptionDataJson : public ResumptionData { */ void Persist() OVERRIDE; - resumption::LastState& last_state() const { - return last_state_; - } + DEPRECATED + resumption::LastState& last_state() const; private: /** @@ -185,22 +189,26 @@ class ResumptionDataJson : public ResumptionData { * or adds the new one. * @param policy_app_id application id. * @param device_id unique id of device. + * @param dictionary - data dictionary where all necessary info stored * @return the reference to the record in applications array. */ Json::Value& GetFromSavedOrAppend(const std::string& policy_app_id, - const std::string& device_id) const; + const std::string& device_id, + Json::Value& dictionary) const; /** * @brief Get applications for resumption of LastState + * @param dictionary - data dictionary where all necessary info stored * @return applications for resumption of LastState */ - Json::Value& GetSavedApplications() const; + Json::Value& GetSavedApplications(Json::Value& dictionary) const; /** * @brief Get Resumption section of LastState + * @param dictionary - data dictionary where all necessary info stored * @return Resumption section of LastState in Json */ - Json::Value& GetResumptionData() const; + Json::Value& GetResumptionData(Json::Value& dictionary) const; /** * @brief GetObjectIndex allows to obtain specified object index from @@ -214,15 +222,17 @@ class ResumptionDataJson : public ResumptionData { /** * @brief Set applications for resumption to LastState + * @param dictionary - data dictionary where all necessary info stored * @parems apps_json applications to write in LastState */ - void SetSavedApplication(Json::Value& apps_json); + void SetSavedApplication(Json::Value& apps_json, Json::Value& dictionary); /** * @brief Setup IgnOff time to LastState + * @param dictionary - data dictionary where all necessary info stored * @param ign_off_time - igition off time */ - void SetLastIgnOffTime(time_t ign_off_time); + void SetLastIgnOffTime(time_t ign_off_time, Json::Value& dictionary); /* * @brief Return true if application resumption data is valid, @@ -231,7 +241,7 @@ class ResumptionDataJson : public ResumptionData { */ bool IsResumptionDataValid(uint32_t index) const; - LastState& last_state_; + resumption::LastStateWrapperPtr last_state_wrapper_; DISALLOW_COPY_AND_ASSIGN(ResumptionDataJson); }; } // namespace resumption |