Process lock_screen_dismissal_warning logic

9 files changed, 77 insertions, 8 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 2671278442..98992a20d5 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -726,6 +726,14 @@ class MessageHelper {
       hmi_apis::Common_Language::eType language);
 
   /**
+   * @brief Converts mobile language to string representation
+   * @param language Mobile UI language
+   * @return Mobile language string representation
+   */
+  static std::string MobileLanguageToString(
+      mobile_apis::Language::eType language);
+
+  /**
    * @brief Converts string to mobile language enum value
    * @param language language as string
    * @return Mobile language enum value
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
index d0280f91f2..917f8be559 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -205,7 +205,7 @@ class PolicyHandler : public PolicyHandlerInterface,
   void OnExceededTimeout() OVERRIDE;
   void OnSystemReady() OVERRIDE;
   const boost::optional<bool> LockScreenDismissalEnabledState() const OVERRIDE;
-  virtual const boost::optional<std::string> LockScreenDismissalWarningMessage(
+  const boost::optional<std::string> LockScreenDismissalWarningMessage(
       const std::string& language) const OVERRIDE;
   void PTUpdatedAt(Counters counter, int value) OVERRIDE;
   void add_listener(PolicyHandlerObserver* listener) OVERRIDE;
diff --git a/src/components/application_manager/include/application_manager/smart_object_keys.h b/src/components/application_manager/include/application_manager/smart_object_keys.h
index a24e624536..69e00f5838 100644
--- a/src/components/application_manager/include/application_manager/smart_object_keys.h
+++ b/src/components/application_manager/include/application_manager/smart_object_keys.h
@@ -481,6 +481,7 @@ extern const char* state;
 extern const char* syncp_timeout;
 extern const char* syncp_url;
 extern const char* lock_screen_dismissal_enabled;
+extern const char* lock_screen_dismissal_warning;
 }  // namespace mobile_notification
 
 namespace hmi_levels {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc
index 0e3a66aad7..4229369acc 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc
@@ -59,12 +59,35 @@ struct OnDriverDistractionProcessor {
 
   void operator()(ApplicationSharedPtr application) {
     if (application) {
-      (*on_driver_distraction_so_)[strings::params][strings::connection_key] =
-          application->app_id();
+      // Create modifiable copy of base message
+      smart_objects::SmartObject message = *on_driver_distraction_so_;
+      message[strings::params][strings::connection_key] = application->app_id();
       const RPCParams params;
       policy::CheckPermissionResult result;
       application_manager_.GetPolicyHandler().CheckPermissions(
           application, stringified_function_id_, params, result);
+      auto& msg_params = message[strings::msg_params];
+      const bool is_lock_screen_dismissal_exists = msg_params.keyExists(
+          mobile_notification::lock_screen_dismissal_enabled);
+
+      if (is_lock_screen_dismissal_exists &&
+          msg_params[mobile_notification::lock_screen_dismissal_enabled]
+              .asBool()) {
+        const auto language =
+            MessageHelper::MobileLanguageToString(application->ui_language());
+
+        const auto warning_message =
+            application_manager_.GetPolicyHandler()
+                .LockScreenDismissalWarningMessage(language);
+        // Only allow lock screen dismissal if a warning message is available
+        if (warning_message && !warning_message->empty()) {
+          msg_params[mobile_notification::lock_screen_dismissal_warning] =
+              *warning_message;
+        } else {
+          msg_params[mobile_notification::lock_screen_dismissal_enabled] =
+              false;
+        }
+      }
       if (result.hmi_level_permitted != policy::kRpcAllowed) {
         MobileMessageQueue messages;
         application->SwapMobileMessageQueue(messages);
@@ -72,15 +95,19 @@ struct OnDriverDistractionProcessor {
             std::remove_if(
                 messages.begin(),
                 messages.end(),
-                [this](smart_objects::SmartObjectSPtr message) {
+                [](smart_objects::SmartObjectSPtr message) {
                   return (*message)[strings::params][strings::function_id]
-                             .asString() == stringified_function_id_;
+                             .asUInt() ==
+                         mobile_api::FunctionID::OnDriverDistractionID;
                 }),
             messages.end());
-        application->PushMobileMessage(on_driver_distraction_so_);
+        application->SwapMobileMessageQueue(messages);
+        application->PushMobileMessage(
+            std::make_shared<smart_objects::SmartObject>(message));
         return;
       }
-      command_.SendNotificationToMobile(on_driver_distraction_so_);
+      command_.SendNotificationToMobile(
+          std::make_shared<smart_objects::SmartObject>(message));
     }
   }
 
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 94278790e7..317ad2933f 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -3924,8 +3924,23 @@ void ApplicationManagerImpl::SendDriverDistractionState(
     if (lock_screen_dismissal &&
         hmi_apis::Common_DriverDistractionState::DD_ON ==
             driver_distraction_state()) {
+      bool dismissal_enabled = *lock_screen_dismissal;
+      if (dismissal_enabled) {
+        const auto language =
+            MessageHelper::MobileLanguageToString(application->ui_language());
+
+        const auto warning_message =
+            policy_handler_->LockScreenDismissalWarningMessage(language);
+        // Only allow lock screen dismissal if a warning message is available
+        if (warning_message && !warning_message->empty()) {
+          msg_params[mobile_notification::lock_screen_dismissal_warning] =
+              *warning_message;
+        } else {
+          dismissal_enabled = false;
+        }
+      }
       msg_params[mobile_notification::lock_screen_dismissal_enabled] =
-          *lock_screen_dismissal;
+          dismissal_enabled;
     }
 
     params[strings::connection_key] = application->app_id();
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 8dc57b96b0..d2e911f227 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -332,6 +332,15 @@ std::string MessageHelper::CommonLanguageToString(
   return std::string();
 }
 
+std::string MessageHelper::MobileLanguageToString(
+    mobile_apis::Language::eType language) {
+  using namespace ns_smart_device_link::ns_smart_objects;
+  const char* str = 0;
+  EnumConversionHelper<mobile_apis::Language::eType>::EnumToCString(language,
+                                                                    &str);
+  return str ? str : std::string();
+}
+
 smart_objects::SmartObjectSPtr MessageHelper::CreateMessageForHMI(
     hmi_apis::messageType::eType message_type, const uint32_t correlation_id) {
   using namespace smart_objects;
diff --git a/src/components/application_manager/src/smart_object_keys.cc b/src/components/application_manager/src/smart_object_keys.cc
index 3c0db278b6..411d0a3e8a 100644
--- a/src/components/application_manager/src/smart_object_keys.cc
+++ b/src/components/application_manager/src/smart_object_keys.cc
@@ -442,6 +442,7 @@ const char* state = "state";
 const char* syncp_timeout = "Timeout";
 const char* syncp_url = "URL";
 const char* lock_screen_dismissal_enabled = "lockScreenDismissalEnabled";
+const char* lock_screen_dismissal_warning = "lockScreenDismissalWarning";
 }  // namespace mobile_notification
 
 namespace hmi_levels {
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 819ead8d8b..29afd36e52 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
@@ -168,6 +168,8 @@ class MockMessageHelper {
                hmi_apis::Common_LightName::eType(const std::string& lightName));
   MOCK_METHOD1(CommonLanguageToString,
                std::string(hmi_apis::Common_Language::eType));
+  MOCK_METHOD1(MobileLanguageToString,
+               std::string(mobile_apis::Language::eType));
   MOCK_METHOD2(CreateModuleInfoSO,
                smart_objects::SmartObjectSPtr(uint32_t function_id,
                                               ApplicationManager& app_mngr));
diff --git a/src/components/application_manager/test/mock_message_helper.cc b/src/components/application_manager/test/mock_message_helper.cc
index 522ef3dbd5..3284224237 100644
--- a/src/components/application_manager/test/mock_message_helper.cc
+++ b/src/components/application_manager/test/mock_message_helper.cc
@@ -366,6 +366,11 @@ std::string MessageHelper::CommonLanguageToString(
   return MockMessageHelper::message_helper_mock()->CommonLanguageToString(lang);
 }
 
+std::string MessageHelper::MobileLanguageToString(
+    mobile_apis::Language::eType lang) {
+  return MockMessageHelper::message_helper_mock()->MobileLanguageToString(lang);
+}
+
 smart_objects::SmartObjectSPtr MessageHelper::GetBCActivateAppRequestToHMI(
     ApplicationConstSharedPtr app,
     const policy::PolicyHandlerInterface& policy_handler,
@@ -589,4 +594,5 @@ void MessageHelper::BroadcastCapabilityUpdate(
   MockMessageHelper::message_helper_mock()->BroadcastCapabilityUpdate(
       msg_params, app_mngr);
 }
+
 }  // namespace application_manager