1 files changed, 23 insertions, 13 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
index 2727c89673..c66e0b6950 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
@@ -77,6 +77,8 @@
 #include "sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h"
 #include "sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h"
 #include "sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_response.h"
+#include "sdl_rpc_plugin/commands/hmi/subscribe_button_request.h"
+#include "sdl_rpc_plugin/commands/hmi/subscribe_button_response.h"
 #include "sdl_rpc_plugin/commands/hmi/tts_change_registration_request.h"
 #include "sdl_rpc_plugin/commands/hmi/tts_change_registration_response.h"
 #include "sdl_rpc_plugin/commands/hmi/tts_get_capabilities_request.h"
@@ -137,6 +139,8 @@
 #include "sdl_rpc_plugin/commands/hmi/ui_slider_response.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_subtle_alert_request.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_subtle_alert_response.h"
+#include "sdl_rpc_plugin/commands/hmi/unsubscribe_button_request.h"
+#include "sdl_rpc_plugin/commands/hmi/unsubscribe_button_response.h"
 #include "sdl_rpc_plugin/commands/hmi/update_app_list_request.h"
 #include "sdl_rpc_plugin/commands/hmi/update_app_list_response.h"
 #include "sdl_rpc_plugin/commands/hmi/update_device_list_request.h"
@@ -207,7 +211,6 @@
 #include "sdl_rpc_plugin/commands/hmi/on_app_unregistered_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_button_event_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_button_press_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_device_chosen_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_device_state_changed_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_driver_distraction_notification.h"
@@ -218,6 +221,7 @@
 #include "sdl_rpc_plugin/commands/hmi/on_ready_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_received_policy_update.h"
 #include "sdl_rpc_plugin/commands/hmi/on_record_start_notification.h"
+#include "sdl_rpc_plugin/commands/hmi/on_reset_timeout_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_sdl_close_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_sdl_persistence_complete_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_system_context_notification.h"
@@ -225,13 +229,11 @@
 #include "sdl_rpc_plugin/commands/hmi/on_system_request_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_system_time_ready_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_tts_language_change_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_tts_reset_timeout_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_tts_started_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_tts_stopped_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_ui_command_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_ui_keyboard_input_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_ui_language_change_notification.h"
-#include "sdl_rpc_plugin/commands/hmi/on_ui_reset_timeout_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_ui_subtle_alert_pressed_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_ui_touch_event_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/on_ui_update_file_notification.h"
@@ -681,6 +683,19 @@ CommandCreator& HMICommandFactory::get_creator_factory(
                  : factory
                        .GetCreator<commands::ButtonGetCapabilitiesResponse>();
     }
+    case hmi_apis::FunctionID::Buttons_SubscribeButton: {
+      return hmi_apis::messageType::request == message_type
+                 ? factory.GetCreator<commands::hmi::SubscribeButtonRequest>()
+                 : factory.GetCreator<commands::hmi::SubscribeButtonResponse>();
+    }
+
+    case hmi_apis::FunctionID::Buttons_UnsubscribeButton: {
+      return hmi_apis::messageType::request == message_type
+                 ? factory.GetCreator<commands::hmi::UnsubscribeButtonRequest>()
+                 : factory
+                       .GetCreator<commands::hmi::UnsubscribeButtonResponse>();
+    }
+
     case hmi_apis::FunctionID::SDL_OnAllowSDLFunctionality: {
       return factory
           .GetCreator<commands::OnAllowSDLFunctionalityNotification>();
@@ -762,10 +777,6 @@ CommandCreator& HMICommandFactory::get_creator_factory(
     case hmi_apis::FunctionID::Buttons_OnButtonPress: {
       return factory.GetCreator<commands::hmi::OnButtonPressNotification>();
     }
-    case hmi_apis::FunctionID::Buttons_OnButtonSubscription: {
-      return factory
-          .GetCreator<commands::hmi::OnButtonSubscriptionNotification>();
-    }
     case hmi_apis::FunctionID::Navigation_OnTBTClientState: {
       return factory.GetCreator<commands::OnNaviTBTClientStateNotification>();
     }
@@ -775,8 +786,8 @@ CommandCreator& HMICommandFactory::get_creator_factory(
     case hmi_apis::FunctionID::UI_OnTouchEvent: {
       return factory.GetCreator<commands::hmi::OnUITouchEventNotification>();
     }
-    case hmi_apis::FunctionID::UI_OnResetTimeout: {
-      return factory.GetCreator<commands::hmi::OnUIResetTimeoutNotification>();
+    case hmi_apis::FunctionID::BasicCommunication_OnResetTimeout: {
+      return factory.GetCreator<commands::hmi::OnResetTimeoutNotification>();
     }
     case hmi_apis::FunctionID::Navigation_SetVideoConfig: {
       return hmi_apis::messageType::request == message_type
@@ -875,9 +886,6 @@ CommandCreator& HMICommandFactory::get_creator_factory(
     case hmi_apis::FunctionID::SDL_OnDeviceStateChanged: {
       return factory.GetCreator<commands::OnDeviceStateChangedNotification>();
     }
-    case hmi_apis::FunctionID::TTS_OnResetTimeout: {
-      return factory.GetCreator<commands::hmi::OnTTSResetTimeoutNotification>();
-    }
     case hmi_apis::FunctionID::BasicCommunication_OnEventChanged: {
       return factory.GetCreator<commands::OnEventChangedNotification>();
     }
@@ -947,7 +955,9 @@ CommandCreator& HMICommandFactory::get_creator_factory(
       return factory
           .GetCreator<commands::BCOnAppCapabilityUpdatedNotification>();
     }
-    default: { return factory.GetCreator<InvalidCommand>(); }
+    default: {
+      return factory.GetCreator<InvalidCommand>();
+    }
   }
 }