[SDL-0190] Handle response from HMI during resumption data

src/components/application_manager/include/application_manager/app_extension.h

@@ -33,15 +33,18 @@
 #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_EXTENSION_H_
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APP_EXTENSION_H_
 
+#include <functional>
 #include <memory>
 
-namespace ns_smart_device_link {
-namespace ns_smart_objects {
-class SmartObject;
-}
-}  // namespace ns_smart_device_link
+#include "smart_objects/smart_object.h"
+
+namespace resumption {
+struct ResumptionRequest;
+class ResumptionDataProcessor;
+}  // namespace resumption
 
 namespace application_manager {
+namespace ns_smart = ns_smart_device_link::ns_smart_objects;
 
 typedef int AppExtensionUID;
 
@@ -59,16 +62,22 @@ class AppExtension {
    * @param resumption_data data reference to data, that will be appended by
    * plugin
    */
-  virtual void SaveResumptionData(
-      ns_smart_device_link::ns_smart_objects::SmartObject& resumption_data) = 0;
+  virtual void SaveResumptionData(ns_smart::SmartObject& resumption_data) = 0;
 
   /**
    * @brief ProcessResumption Method called by SDL during resumption.
    * @param resumption_data list of resumption data
+   * @param subscriber callbacks for subscribing
    */
   virtual void ProcessResumption(
-      const ns_smart_device_link::ns_smart_objects::SmartObject&
-          resumption_data) = 0;
+      const ns_smart::SmartObject& resumption_data) = 0;
+
+  /**
+   * @brief RevertResumption Method called by SDL during revert resumption.
+   * @param subscriptions Subscriptions from which must discard. Expected that
+   * SO contains the map of "IVI data" keys and "subscription bool flag" values
+   */
+  virtual void RevertResumption(const ns_smart::SmartObject& subscriptions) = 0;
 
  private:
   const AppExtensionUID kUid_;

src/components/application_manager/include/application_manager/application_data_impl.h

@@ -332,12 +332,14 @@ class DynamicApplicationDataImpl : public virtual Application {
   SubMenuMap sub_menu_;
   mutable std::shared_ptr<sync_primitives::RecursiveLock> sub_menu_lock_ptr_;
   ChoiceSetMap choice_set_map_;
-  mutable std::shared_ptr<sync_primitives::Lock> choice_set_map_lock_ptr_;
+  mutable std::shared_ptr<sync_primitives::RecursiveLock>
+      choice_set_map_lock_ptr_;
   PerformChoiceSetMap performinteraction_choice_set_map_;
   mutable std::shared_ptr<sync_primitives::RecursiveLock>
       performinteraction_choice_set_lock_ptr_;
   WindowParamsMap window_params_map_;
-  mutable std::shared_ptr<sync_primitives::Lock> window_params_map_lock_ptr_;
+  mutable std::shared_ptr<sync_primitives::RecursiveLock>
+      window_params_map_lock_ptr_;
   uint32_t is_perform_interaction_active_;
   bool is_reset_global_properties_active_;
   int32_t perform_interaction_mode_;

src/components/application_manager/include/application_manager/application_manager_impl.h

@@ -279,11 +279,11 @@ class ApplicationManagerImpl
 
   /**
    * @brief Checks if Application is subscribed for way points
-   * @param Application pointer
+   * @param Application reference
    * @return true if Application is subscribed for way points
    * otherwise false
    */
-  bool IsAppSubscribedForWayPoints(ApplicationSharedPtr app) const OVERRIDE;
+  bool IsAppSubscribedForWayPoints(Application& app) const OVERRIDE;
 
   void SaveWayPointsMessage(
       smart_objects::SmartObjectSPtr way_points_message) OVERRIDE;
@@ -983,6 +983,13 @@ class ApplicationManagerImpl
    */
   void RemoveAppFromTTSGlobalPropertiesList(const uint32_t app_id) OVERRIDE;
 
+  ResetGlobalPropertiesResult ResetGlobalProperties(
+      const smart_objects::SmartObject& global_properties_ids,
+      const uint32_t app_id) OVERRIDE;
+
+  ResetGlobalPropertiesResult ResetAllApplicationGlobalProperties(
+      const uint32_t app_id) OVERRIDE;
+
   // TODO(AOleynik): Temporary added, to fix build. Should be reworked.
   connection_handler::ConnectionHandler& connection_handler() const OVERRIDE;
   protocol_handler::ProtocolHandler& protocol_handler() const OVERRIDE;
@@ -1341,6 +1348,39 @@ class ApplicationManagerImpl
    */
   void SendMobileMessage(smart_objects::SmartObjectSPtr message);
 
+  /**
+   * @brief Sets default value of the HELPPROMT global property
+   * to the first vrCommand of the Command Menu registered in application
+   *
+   * @param app Registered application
+   * @param is_timeout_promp Flag indicating that timeout prompt
+   * should be reset
+   *
+   * @return TRUE on success, otherwise FALSE
+   */
+  bool ResetHelpPromt(ApplicationSharedPtr app) const;
+
+  /**
+   * @brief  Sets default value of the TIMEOUTPROMT global property
+   * to the first vrCommand of the Command Menu registered in application
+   *
+   * @param app Registered application
+   *
+   * @return TRUE on success, otherwise FALSE
+   */
+  bool ResetTimeoutPromt(ApplicationSharedPtr app) const;
+
+  /**
+   * @brief Sets default value of the VRHELPTITLE global property
+   * to the application name and value of the VRHELPITEMS global property
+   * to value equal to registered command -1(default command “Help / Cancel”.)
+   *
+   * @param app Registered application
+   *
+   * @return TRUE on success, otherwise FALSE
+   */
+  bool ResetVrHelpTitleItems(ApplicationSharedPtr app) const;
+
  private:
   /*
    * NaviServiceStatusMap shows which navi service (audio/video) is opened
@@ -1364,6 +1404,16 @@ class ApplicationManagerImpl
   std::string GetHashedAppID(uint32_t connection_key,
                              const std::string& policy_app_id) const;
 
+  /**
+   * @brief CreateAllAppGlobalPropsIDList creates an array of all application
+   * global properties IDs. Used as utility to call
+   * ApplicationManger::ResetGlobalProperties
+   * with all global properties.
+   * @return array smart object with global properties identifiers.
+   */
+  const smart_objects::SmartObjectSPtr CreateAllAppGlobalPropsIDList(
+      const uint32_t app_id) const;
+
   /**
    * @brief Removes suspended and stopped timers from timer pool
    */

src/components/application_manager/include/application_manager/display_capabilities_builder.h

@@ -67,6 +67,16 @@ class DisplayCapabilitiesBuilder {
   void UpdateDisplayCapabilities(
       const smart_objects::SmartObject& display_capabilities);
 
+  /**
+   * @brief IsWaitingForWindowCapabilities checks wheter builder is waiting for
+   * a capabilities notification for at least one window or not
+   * @param incoming_display_capabilities capabilities to analyze
+   * @return true if builder is waiting for capabilities for at least one
+   * window, otherwise returns false
+   */
+  bool IsWaitingForWindowCapabilities(
+      const smart_objects::SmartObject& incoming_display_capabilities) const;
+
   /**
    * @brief ResetDisplayCapabilities resets stored notification
    */
@@ -84,13 +94,29 @@ class DisplayCapabilitiesBuilder {
    */
   const smart_objects::SmartObjectSPtr display_capabilities() const;
 
+  /**
+   * @brief IsWindowResumptionNeeded checks that is there a need for
+   * resumption of windows (except main window)
+   * @return true if data about windows to be resumed was saved in window_info,
+   * otherwise returns false
+   */
+
+  bool IsWindowResumptionNeeded() const;
+
  private:
+  /**
+   * @brief InvokeResumeCallback invokes resume callback function if all
+   * required criteria is met
+   */
+  void InvokeResumeCallback();
+
   smart_objects::SmartObjectSPtr display_capabilities_;
   typedef std::set<WindowID> WindowIDsToResume;
   WindowIDsToResume window_ids_to_resume_;
   Application& owner_;
   ResumeCallback resume_callback_;
-  sync_primitives::Lock display_capabilities_lock_;
+  mutable sync_primitives::Lock display_capabilities_lock_;
+  bool is_widget_windows_resumption_;
 };
 }  // namespace application_manager
 #endif