Answer to reviewers

smartdevicelink · May 29, 2017 · 20a8cd4 · 20a8cd4
1 parent 553abdd
commit 20a8cd4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 8 deletions.
diff --git a/...omponents/application_manager/include/application_manager/commands/command_request_impl.h b/...omponents/application_manager/include/application_manager/commands/command_request_impl.h
@@ -111,14 +111,29 @@ std::string MergeInfos(const std::string& first,
  * @brief IsResultCodeUnsupported check if overall result code of provided infos
  * is UNSUPPORTED_RESOURCE
  * @param first - contains result_code from HMI response and
- * interface that returns response
+ * interface that returns first response
  * @param second - contains result_code from HMI response and
- * interface that returns response
- * @return true if result code UNSUPPORTED_RESOURCE otherwise false
+ * interface that returns second response
+ * @return true if overall result code is UNSUPPORTED_RESOURCE otherwise false
  */
 bool IsResultCodeUnsupported(const ResponseInfo& first,
                              const ResponseInfo& second);
 
+/**
+ * @brief IsResultCodeUnsupported check if overall result code of provided infos
+ * is UNSUPPORTED_RESOURCE
+ * @param first - contains result_code from HMI response and
+ * interface that returns first response
+ * @param second - contains result_code from HMI response and
+ * interface that returns second response
+ * @param third - contains result_code from HMI response and
+ * interface that returns third response
+ * @return true if overall result code is UNSUPPORTED_RESOURCE otherwise false
+ */
+bool IsResultCodeUnsupported(const ResponseInfo& first,
+                             const ResponseInfo& second,
+                             const ResponseInfo& third);
+
 class CommandRequestImpl : public CommandImpl,
                            public event_engine::EventObserver {
  public:

diff --git a/.../application_manager/include/application_manager/commands/mobile/alert_maneuver_request.h b/.../application_manager/include/application_manager/commands/mobile/alert_maneuver_request.h
@@ -94,9 +94,8 @@ class AlertManeuverRequest : public CommandRequestImpl {
    * @return true if result code complies successful result code
    * otherwise returns false
    */
-  bool PrepareResultForMobileResponse(
-      ResponseInfo& navigation_alert_info,
-      ResponseInfo& tts_alert_info) const OVERRIDE;
+  bool PrepareResultForMobileResponse(ResponseInfo& navigation_alert_info,
+                                      ResponseInfo& tts_alert_info) const FINAL;
 
   /**
    * @brief Checks alert maneuver params(ttsChunks, ...).

diff --git a/src/components/application_manager/src/commands/command_request_impl.cc b/src/components/application_manager/src/commands/command_request_impl.cc
@@ -118,6 +118,13 @@ bool IsResultCodeUnsupported(const ResponseInfo& first,
          (first.is_unsupported_resource && second.is_unsupported_resource);
 }
 
+bool IsResultCodeUnsupported(const ResponseInfo& first,
+                             const ResponseInfo& second,
+                             const ResponseInfo& third) {
+  return IsResultCodeUnsupported(first, second) ||
+         IsResultCodeUnsupported(second, third);
+}
+
 struct DisallowedParamsInserter {
   DisallowedParamsInserter(smart_objects::SmartObject& response,
                            mobile_apis::VehicleDataResultCode::eType code)

diff --git a/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc b/src/components/application_manager/src/commands/mobile/alert_maneuver_request.cc
@@ -209,7 +209,7 @@ bool AlertManeuverRequest::PrepareResultForMobileResponse(
     ResponseInfo& navigation_alert_info, ResponseInfo& tts_alert_info) const {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  const bool result = CommandRequestImpl::PrepareResultForMobileResponse(
+  bool result = CommandRequestImpl::PrepareResultForMobileResponse(
       navigation_alert_info, tts_alert_info);
   if (result && (hmi_apis::Common_Result::UNSUPPORTED_RESOURCE ==
                      tts_alert_info.result_code &&
@@ -218,7 +218,7 @@ bool AlertManeuverRequest::PrepareResultForMobileResponse(
                       HmiInterfaces::HMI_INTERFACE_TTS)))) {
     tts_alert_info.result_code = hmi_apis::Common_Result::WARNINGS;
   } else if (IsResultCodeUnsupported(navigation_alert_info, tts_alert_info)) {
-    return true;
+    result = true;
   }
 
   return result;