Fix style

9 files changed, 20 insertions, 18 deletions

diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h
index 0642dd3cd1..cb674c6c4b 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -485,14 +485,17 @@ class MessageHelper {
                             ApplicationManager& app_man);
 
   /*
-   * @brief Send notification to mobile on application permissions update
-   * @param connection_key Id of application to send message to
-   * @param permissions updated permissions for application
-   */
+  * @brief Send notification to mobile on application permissions update
+  * @param connection_key Id of application to send message to
+  * @param permissions updated permissions for application
+  * @param app_mngr reference ro application manager
+  * @param require_encryption require encryption flag
+  */
   static void SendOnPermissionsChangeNotification(
       uint32_t connection_key,
       const policy::Permissions& permissions,
-      ApplicationManager& app_mngr);
+      ApplicationManager& app_mngr,
+      const policy::EncryptionRequired encryprion_required);
 
   /*
    * @brief Send notification to HMI on application permissions update
diff --git a/src/components/application_manager/include/application_manager/rpc_service_impl.h b/src/components/application_manager/include/application_manager/rpc_service_impl.h
index a33570e180..5ebcb577cc 100644
--- a/src/components/application_manager/include/application_manager/rpc_service_impl.h
+++ b/src/components/application_manager/include/application_manager/rpc_service_impl.h
@@ -141,7 +141,7 @@ class RPCServiceImpl : public RPCService,
  private:
   bool ConvertSOtoMessage(const smart_objects::SmartObject& message,
                           Message& output,
-			  const bool allow_unknown_parameters = false);
+                          const bool allow_unknown_parameters = false);
 
   EncryptionFlagCheckResult IsEncryptionRequired(
       const smart_objects::SmartObject& message,
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
index 2b3d6e0ad6..30dd34a7f7 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -2401,8 +2401,8 @@ void MessageHelper::SendQueryApps(const uint32_t connection_key,
 void MessageHelper::SendOnPermissionsChangeNotification(
     uint32_t connection_key,
     const policy::Permissions& permissions,
-    const policy::EncryptionRequired encryprion_required,
-    ApplicationManager& app_mngr) {
+    ApplicationManager& app_mngr,
+    const policy::EncryptionRequired encryprion_required) {
   LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject content(smart_objects::SmartType_Map);
 
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index 3f03c56cd1..dea059e07b 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -1420,8 +1420,6 @@ void PolicyHandler::OnPermissionsUpdated(const std::string& policy_app_id,
   ApplicationSharedPtr app =
       application_manager_.application_by_policy_id(policy_app_id);
 
-  const auto require_encryption =
-      policy_manager_->GetAppEncryptionRequired(policy_app_id);
   if (app.use_count() == 0) {
     LOG4CXX_WARN(
         logger_,
diff --git a/src/components/application_manager/test/include/application_manager/mock_message_helper.h b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
index 08ac1b5ffb..607c1e502a 100644
--- a/src/components/application_manager/test/include/application_manager/mock_message_helper.h
+++ b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
@@ -156,8 +156,8 @@ class MockMessageHelper {
   MOCK_METHOD4(SendOnPermissionsChangeNotification,
                void(uint32_t connection_key,
                     const policy::Permissions& permissions,
-                    const bool require_encryption,
-                    ApplicationManager& app_mngr));
+                    ApplicationManager& app_mngr,
+                    const bool require_encryption));
   MOCK_METHOD4(SendPolicySnapshotNotification,
                void(uint32_t connection_key,
                     const std::vector<uint8_t>& policy_data,
diff --git a/src/components/application_manager/test/mock_message_helper.cc b/src/components/application_manager/test/mock_message_helper.cc
index 736e27f36a..17ba4bec61 100644
--- a/src/components/application_manager/test/mock_message_helper.cc
+++ b/src/components/application_manager/test/mock_message_helper.cc
@@ -212,10 +212,10 @@ void MessageHelper::SendGetListOfPermissionsResponse(
 void MessageHelper::SendOnPermissionsChangeNotification(
     uint32_t connection_key,
     const policy::Permissions& permissions,
-    const policy::EncryptionRequired require_encryption,
-    ApplicationManager& app_mngr) {
+    ApplicationManager& app_mngr,
+    const policy::EncryptionRequired require_encryption) {
   MockMessageHelper::message_helper_mock()->SendOnPermissionsChangeNotification(
-      connection_key, permissions, require_encryption, app_mngr);
+      connection_key, permissions, app_mngr, require_encryption);
 }
 
 void MessageHelper::SendPolicySnapshotNotification(
diff --git a/src/components/policy/policy_external/src/sql_pt_queries.cc b/src/components/policy/policy_external/src/sql_pt_queries.cc
index 121c77632f..bb793ea61c 100644
--- a/src/components/policy/policy_external/src/sql_pt_queries.cc
+++ b/src/components/policy/policy_external/src/sql_pt_queries.cc
@@ -681,7 +681,8 @@ const std::string kInsertApplication =
     "INSERT OR IGNORE INTO `application` (`id`, `priority_value`, "
     "`is_revoked`, `memory_kb`, `heart_beat_timeout_ms`, `certificate`, "
     "`hybrid_app_preference_value`, `endpoint`, `enabled`, `auth_token`, "
-    "`cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough`, `encryption_required`) "
+    "`cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough`, "
+    "`encryption_required`) "
     "VALUES "
     "(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 
diff --git a/src/components/policy/policy_regular/src/sql_pt_queries.cc b/src/components/policy/policy_regular/src/sql_pt_queries.cc
index 380570716d..eef66f71cf 100644
--- a/src/components/policy/policy_regular/src/sql_pt_queries.cc
+++ b/src/components/policy/policy_regular/src/sql_pt_queries.cc
@@ -630,7 +630,8 @@ const std::string kInsertApplication =
     "INSERT OR IGNORE INTO `application` (`id`, `priority_value`, "
     "`is_revoked`, `memory_kb`, `heart_beat_timeout_ms`, `certificate`, "
     "`hybrid_app_preference_value`, `endpoint`, `enabled`, `auth_token`, "
-    "`cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough` ,`encryption_required`) "
+    "`cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough` "
+    ",`encryption_required`) "
     "VALUES "
     "(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 
diff --git a/src/components/policy/policy_regular/src/sql_pt_representation.cc b/src/components/policy/policy_regular/src/sql_pt_representation.cc
index 8a7c425110..7b43f1ee5a 100644
--- a/src/components/policy/policy_regular/src/sql_pt_representation.cc
+++ b/src/components/policy/policy_regular/src/sql_pt_representation.cc
@@ -726,7 +726,6 @@ bool SQLPTRepresentation::GatherApplicationPoliciesSection(
       *params.certificate = query.GetString(4);
     }
 
-    
     // Read cloud app properties
     policy_table::HybridAppPreference hap;
     bool valid = policy_table::EnumFromJsonString(query.GetString(5), &hap);