diff options
Diffstat (limited to 'src/components/application_manager/include/application_manager/resumption')
5 files changed, 29 insertions, 18 deletions
diff --git a/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h b/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h index 78366ea96a..e572eaec39 100644 --- a/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h +++ b/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h @@ -47,8 +47,6 @@ namespace app_mngr = application_manager; namespace resumption { -class LastState; - /** * @brief Contains logic for storage/restore data of applications. */ @@ -272,12 +270,15 @@ class ResumeCtrl { */ virtual void RemoveFromResumption(uint32_t app_id) = 0; + DEPRECATED + virtual bool Init(resumption::LastState& last_state) = 0; + /** * @brief Initialization data for Resume controller * @return true if initialization is success otherwise * returns false */ - virtual bool Init(LastState& last_state) = 0; + virtual bool Init(resumption::LastStateWrapperPtr last_state_wrapper) = 0; /** * @brief Notify resume controller about new application diff --git a/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h b/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h index f0d5dc39e4..3ac59b9f88 100644 --- a/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h +++ b/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h @@ -52,8 +52,6 @@ namespace resumption { -class LastState; - /** * @brief Contains logic for storage/restore data of applications. */ @@ -286,12 +284,14 @@ class ResumeCtrlImpl : public ResumeCtrl, */ void RemoveFromResumption(uint32_t app_id) OVERRIDE; + DEPRECATED bool Init(resumption::LastState& last_state) FINAL; + /** * @brief Initialization data for Resume controller * @return true if initialization is success otherwise * returns false */ - bool Init(LastState& last_state) OVERRIDE; + bool Init(resumption::LastStateWrapperPtr last_state_wrapper) FINAL; /** * @brief Notify resume controller about new application diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data.h b/src/components/application_manager/include/application_manager/resumption/resumption_data.h index d1dada345c..69fc5437de 100644 --- a/src/components/application_manager/include/application_manager/resumption/resumption_data.h +++ b/src/components/application_manager/include/application_manager/resumption/resumption_data.h @@ -305,7 +305,6 @@ class ResumptionData { ++first; } } - mutable sync_primitives::RecursiveLock resumption_lock_; const application_manager::ApplicationManager& application_manager_; }; } // namespace resumption diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h b/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h index 2b5a1fdcc9..a667dbf8e2 100644 --- a/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h +++ b/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h @@ -838,6 +838,7 @@ class ResumptionDataDB : public ResumptionData { DISALLOW_COPY_AND_ASSIGN(ResumptionDataDB); utils::dbms::SQLDatabase* db_; + mutable sync_primitives::RecursiveLock resumption_lock_; }; } // namespace resumption 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 |