fixup! Added logic for processing RPC according to the proposal.

3 files changed, 4 insertions, 100 deletions

diff --git a/src/components/application_manager/src/rpc_service_impl.cc b/src/components/application_manager/src/rpc_service_impl.cc
index c3e3873dba..cfd5335a42 100644
--- a/src/components/application_manager/src/rpc_service_impl.cc
+++ b/src/components/application_manager/src/rpc_service_impl.cc
@@ -170,7 +170,6 @@ bool RPCServiceImpl::ManageMobileCommand(
           function_id,
           correlation_id,
           static_cast<int32_t>(mobile_apis::Result::ENCRYPTION_NEEDED));
-      ;
       SendMessageToMobile(response);
       return false;
     }
@@ -536,7 +535,7 @@ void RPCServiceImpl::SendMessageToMobile(
     return;
   }
   const auto api_function_id = static_cast<mobile_apis::FunctionID::eType>(
-      (*message)[strings::params][strings::function_id].asInt());
+      (*message)[strings::params][strings::function_id].asUInt());
 
   smart_objects::SmartObject& msg_to_mobile = *message;
   // If correlation_id is not present, it is from-HMI message which should be
diff --git a/src/components/include/application_manager/policies/rpc_encryption_data_accessor_interface.h b/src/components/include/application_manager/policies/rpc_encryption_data_accessor_interface.h
deleted file mode 100644
index b43f3778cd..0000000000
--- a/src/components/include/application_manager/policies/rpc_encryption_data_accessor_interface.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2019, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_POLICIES_RPC_ENCRYPTION_MANAGER
-#define SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_POLICIES_RPC_ENCRYPTION_MANAGER
-
-#include <string>
-#include "policy/policy_table/types.h"
-
-using rpc::policy_table_interface_base::Strings;
-
-namespace policy {
-/*
- * @brief RPCEncryptionDataAccessorInterface interface
- */
-class RPCEncryptionDataAccessorInterface {
- public:
-  /*!
-   * @brief virtual destructor RPCEncryptionDataAccessorInterface
-   */
-  virtual ~RPCEncryptionDataAccessorInterface() {}
-
-  /*
-   * @param policy_app_id policy app id
-   * @return true if the app need encryption
-   */
-  virtual bool AppNeedEncryption(const std::string& policy_app_id) const = 0;
-
-  /*
-   * @brief Retrieves encryption required flag on the application level
-   * @param policy_app_id policy app id
-   * @return true if the app need encryption
-   */
-  virtual const rpc::Optional<rpc::Boolean> GetAppEncryptionRequired(
-      const std::string& policy_app_id) const = 0;
-
-  /*
-   * @param policy_app_id policy app id
-   * @return groups that exist for app
-   */
-  virtual const Strings GetGroupsForApp(
-      const std::string& policy_app_id) const = 0;
-
-  /*
-   * @param policy_group group
-   * @return true if the group need encryption
-   */
-  virtual bool GroupNeedEncryption(const std::string& policy_group) const = 0;
-
-  /*
-   * @param policy_group group
-   * @return RPCs that exists in group
-   */
-  virtual const std::vector<std::string> GetRPCsForGroup(
-      const std::string& group) const = 0;
-
-  /*
-   * @param function_id function id
-   * @return policy function name
-   */
-  virtual const std::string GetPolicyFunctionName(
-      const uint32_t function_id) const = 0;
-};
-
-}  // namespace policy
-#endif  // SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_POLICIES_RPC_ENCRYPTION_MANAGER
diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml
index 5d23ee3264..d4cae5249d 100644
--- a/src/components/interfaces/MOBILE_API.xml
+++ b/src/components/interfaces/MOBILE_API.xml
@@ -138,7 +138,7 @@
         <element name="CORRUPTED_DATA" since="5.0">
             <description>The data sent failed to pass CRC check in receiver end</description>
         </element>
-        <element name="ENCRYPTION_NEEDED" since="5.1">
+        <element name="ENCRYPTION_NEEDED" since="6.0">
         <description>SDL receives an un-encrypted PRC request that needs protection. </description>
         </element>
     </enum>
@@ -2238,7 +2238,7 @@
         </param>
         <param name="hmiPermissions" type="HMIPermissions"  mandatory="true"/>
         <param name="parameterPermissions" type="ParameterPermissions"  mandatory="true"/>
-        <param name="requireEncryption" type="Boolean" mandatory="false" since="5.1"/>
+        <param name="requireEncryption" type="Boolean" mandatory="false" since="6.0"/>
     </struct>
     
     <struct name="DisplayCapabilities" deprecated="true" since="6.0">
@@ -8014,7 +8014,7 @@
         <param name="permissionItem" type="PermissionItem" minsize="0" maxsize="500" array="true" mandatory="true">
             <description>Change in permissions for a given set of RPCs</description>
         </param>
-        <param name="requireEncryption" type="Boolean" mandatory="false" since="5.1"/>
+        <param name="requireEncryption" type="Boolean" mandatory="false" since="6.0"/>
     </function>
     
     <function name="OnAudioPassThru" functionID="OnAudioPassThruID" messagetype="notification" since="2.0">