1 files changed, 4 insertions, 21 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc
index 2546b704b2..4882095d42 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_is_ready_request.cc
@@ -31,7 +31,6 @@
  */
 
 #include "sdl_rpc_plugin/commands/hmi/ui_is_ready_request.h"
-#include "application_manager/message_helper.h"
 #include "application_manager/rpc_service.h"
 
 namespace sdl_rpc_plugin {
@@ -73,11 +72,13 @@ void UIIsReadyRequest::on_event(const event_engine::Event& event) {
       hmi_capabilities.set_is_ui_cooperating(is_available);
       if (!app_mngr::commands::CheckAvailabilityHMIInterfaces(
               application_manager_, HmiInterfaces::HMI_INTERFACE_UI)) {
+        UpdateRequiredInterfaceCapabilitiesRequests(hmi_interface::ui);
         LOG4CXX_INFO(logger_,
                      "HmiInterfaces::HMI_INTERFACE_UI isn't available");
         return;
       }
-      SendMessageToHMI();
+
+      RequestInterfaceCapabilities(hmi_interface::ui);
       break;
     }
     default: {
@@ -89,25 +90,7 @@ void UIIsReadyRequest::on_event(const event_engine::Event& event) {
 
 void UIIsReadyRequest::onTimeOut() {
   // Note(dtrunov): According to new requirment APPLINK-27956
-  SendMessageToHMI();
-}
-
-void UIIsReadyRequest::SendMessageToHMI() {
-  std::shared_ptr<smart_objects::SmartObject> get_language(
-      MessageHelper::CreateModuleInfoSO(hmi_apis::FunctionID::UI_GetLanguage,
-                                        application_manager_));
-  HMICapabilities& hmi_capabilities = hmi_capabilities_;
-  hmi_capabilities.set_handle_response_for(*get_language);
-  rpc_service_.ManageHMICommand(get_language);
-  std::shared_ptr<smart_objects::SmartObject> get_all_languages(
-      MessageHelper::CreateModuleInfoSO(
-          hmi_apis::FunctionID::UI_GetSupportedLanguages,
-          application_manager_));
-  rpc_service_.ManageHMICommand(get_all_languages);
-  std::shared_ptr<smart_objects::SmartObject> get_capabilities(
-      MessageHelper::CreateModuleInfoSO(
-          hmi_apis::FunctionID::UI_GetCapabilities, application_manager_));
-  rpc_service_.ManageHMICommand(get_capabilities);
+  RequestInterfaceCapabilities(hmi_interface::ui);
 }
 
 }  // namespace commands