fixes after review

LuxoftSDL · Jul 9, 2021 · 2529ff7 · 2529ff7
1 parent ad1121b
commit 2529ff7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/...ication_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/unsubscribe_button_request.cc b/...ication_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/unsubscribe_button_request.cc
@@ -88,8 +88,7 @@ void UnsubscribeButtonRequest::Run() {
 
 void UnsubscribeButtonRequest::onTimeOut() {
   SDL_LOG_AUTO_TRACE();
-  application_manager_.updateRequestTimeout(
-      connection_key(), correlation_id(), 0);
+
   auto& resume_ctrl = application_manager_.resume_controller();
 
   resume_ctrl.HandleOnTimeOut(
@@ -133,7 +132,9 @@ void UnsubscribeButtonRequest::on_event(const event_engine::Event& event) {
       static_cast<hmi_apis::Common_Result::eType>(
           message[strings::params][hmi_response::code].asInt());
 
-  if (hmi_apis::Common_Result::SUCCESS == hmi_result && is_pending) {
+  if ((hmi_apis::Common_Result::SUCCESS == hmi_result ||
+       hmi_apis::Common_Result::WARNINGS == hmi_result) &&
+      is_pending) {
     const mobile_apis::ButtonName::eType btn_id =
         static_cast<mobile_apis::ButtonName::eType>(
             (*message_)[strings::msg_params][strings::button_name].asInt());

diff --git a/...tion_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc b/...tion_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc
@@ -134,13 +134,6 @@ void UnsubscribeButtonRequest::on_event(const event_engine::Event& event) {
   const bool result = PrepareResultForMobileResponse(
       hmi_result, HmiInterfaces::HMI_INTERFACE_Buttons);
 
-  if (result) {
-    const mobile_apis::ButtonName::eType btn_id =
-        static_cast<mobile_apis::ButtonName::eType>(
-            (*message_)[str::msg_params][str::button_name].asInt());
-    app->UnsubscribeFromButton(
-        static_cast<mobile_apis::ButtonName::eType>(btn_id));
-  }
   mobile_apis::Result::eType result_code =
       MessageHelper::HMIToMobileResult(hmi_result);