1 files changed, 43 insertions, 16 deletions

diff --git a/src/components/policy/policy_regular/include/policy/policy_helper.h b/src/components/policy/policy_regular/include/policy/policy_helper.h
index 4c697858f5..d5155cf91b 100644
--- a/src/components/policy/policy_regular/include/policy/policy_helper.h
+++ b/src/components/policy/policy_regular/include/policy/policy_helper.h
@@ -1,4 +1,4 @@
-/*
+/*
  Copyright (c) 2013, Ford Motor Company
  All rights reserved.
 
@@ -83,22 +83,11 @@ bool operator!=(const policy_table::ApplicationParams& first,
 struct CheckAppPolicy {
   CheckAppPolicy(PolicyManagerImpl* pm,
                  const std::shared_ptr<policy_table::Table> update,
-                 const std::shared_ptr<policy_table::Table> snapshot);
+                 const std::shared_ptr<policy_table::Table> snapshot,
+                 CheckAppPolicyResults& out_results);
   bool operator()(const AppPoliciesValueType& app_policy);
 
  private:
-  enum PermissionsCheckResult {
-    RESULT_NO_CHANGES,
-    RESULT_APP_REVOKED,
-    RESULT_NICKNAME_MISMATCH,
-    RESULT_PERMISSIONS_REVOKED,
-    RESULT_CONSENT_NEEDED,
-    RESULT_CONSENT_NOT_REQIURED,
-    RESULT_PERMISSIONS_REVOKED_AND_CONSENT_NEEDED,
-    RESULT_REQUEST_TYPE_CHANGED,
-    RESULT_REQUEST_SUBTYPE_CHANGED
-  };
-
   void SetPendingPermissions(const AppPoliciesValueType& app_policy,
                              PermissionsCheckResult result) const;
   PermissionsCheckResult CheckPermissionsChanges(
@@ -107,6 +96,8 @@ struct CheckAppPolicy {
                         policy_table::Strings* revoked_groups = NULL) const;
   bool HasNewGroups(const AppPoliciesValueType& app_policy,
                     policy_table::Strings* new_groups = NULL) const;
+  bool HasUpdatedGroups(const policy::AppPoliciesValueType& app_policy,
+                        policy_table::Strings* updated_groups = NULL) const;
   bool HasConsentNeededGroups(const AppPoliciesValueType& app_policy) const;
   std::vector<FunctionalGroupPermission> GetRevokedGroups(
       const AppPoliciesValueType& app_policy) const;
@@ -115,10 +106,18 @@ struct CheckAppPolicy {
       const std::vector<FunctionalGroupPermission>& revoked_groups) const;
   bool IsKnownAppication(const std::string& application_id) const;
   void NotifySystem(const AppPoliciesValueType& app_policy) const;
-  void SendPermissionsToApp(const std::string& app_id,
-                            const policy_table::Strings& groups) const;
   bool IsAppRevoked(const AppPoliciesValueType& app_policy) const;
   bool NicknamesMatch(const AppPoliciesValueType& app_policy) const;
+
+  /**
+   * @brief Check of current policy against incoming updated policy is
+   * performed.
+   * This function adds result code of this check to container.
+   * @param app_id Application id
+   * @param result Result value
+   */
+  void AddResult(const std::string& app_id, PermissionsCheckResult result);
+
   /**
    * @brief Allows to check if appropriate group requires any consent.
    * @param group_name the group for which consent will be checked.
@@ -129,10 +128,35 @@ struct CheckAppPolicy {
   bool IsRequestTypeChanged(const AppPoliciesValueType& app_policy) const;
   bool IsRequestSubTypeChanged(const AppPoliciesValueType& app_policy) const;
 
+  bool IsEncryptionRequiredFlagChanged(
+      const AppPoliciesValueType& app_policy) const;
+
+  bool IsAppPropertiesChanged(const AppPoliciesValueType& app_policy) const;
+
+  bool IsAppPropertiesProvided(const AppPoliciesValueType& app_policy) const;
+
  private:
   PolicyManagerImpl* pm_;
   const std::shared_ptr<policy_table::Table> update_;
   const std::shared_ptr<policy_table::Table> snapshot_;
+  CheckAppPolicyResults& out_results_;
+};
+
+/**
+ * @brief Helper struct for filling actions to be done for processed application
+ * using CheckAppPolicyResults data as a source
+ */
+struct FillActionsForAppPolicies {
+  FillActionsForAppPolicies(
+      ApplicationsPoliciesActions& actions,
+      const policy_table::ApplicationPolicies& app_policies)
+      : actions_(actions), app_policies_(app_policies) {}
+
+  void operator()(const policy::CheckAppPolicyResults::value_type& value);
+
+ private:
+  ApplicationsPoliciesActions& actions_;
+  const policy_table::ApplicationPolicies& app_policies_;
 };
 
 /*
@@ -174,6 +198,9 @@ struct ProcessFunctionalGroup {
 
  private:
   GroupConsent GetGroupState(const std::string& group_name);
+  void FillEncryptionFlagForRpcs(
+      const policy_table::Rpc& rpcs,
+      const policy::EncryptionRequired encryption_required);
   const policy_table::FunctionalGroupings& fg_;
   const std::vector<FunctionalGroupPermission>& group_permissions_;
   Permissions& data_;