Remove OnButtonSubscription notification

LuxoftSDL · Jul 12, 2021 · e5dfa88 · e5dfa88
1 parent 06dc978
commit e5dfa88
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 391 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
@@ -272,40 +272,6 @@ class MessageHelper {
   static smart_objects::SmartObjectSPtr CreateSetAppIcon(
       const std::string& path_to_icon, uint32_t app_id);
 
-  /**
-   * @brief Sends button subscription notification
-   * @param app_id Application ID
-   * @param button Enum with button name
-   * @param is_subscribed true if subscribed, false otherwise
-   * @param app_mngr reference to application manager
-   */
-  static void SendOnButtonSubscriptionNotification(
-      const uint32_t app_id,
-      const hmi_apis::Common_ButtonName::eType button,
-      const bool is_subscribed,
-      ApplicationManager& app_mngr);
-
-  /**
-   * @brief Creates button subscription notification
-   * @param app_id Application ID
-   * @param button Enum with button name
-   * @param is_subscribed true if subscribed, false otherwise
-   * @return notification message in SmartObject format
-   */
-  static smart_objects::SmartObjectSPtr CreateOnButtonSubscriptionNotification(
-      const uint32_t app_id,
-      const hmi_apis::Common_ButtonName::eType button,
-      const bool is_subscribed);
-
-  /**
-   * @brief Sends button subscription notifications for all buttons
-   * that application is subscribed on
-   * @param app shared pointer to application instance
-   * @param app_mngr reference to application manager
-   */
-  static void SendAllOnButtonSubscriptionNotificationsForApp(
-      ApplicationConstSharedPtr app, ApplicationManager& app_mngr);
-
   /**
    * @brief Creates button subscription requests for buttons
    * that application is subscribed on
@@ -1010,18 +976,6 @@ class MessageHelper {
   static void SendResetPropertiesRequest(ApplicationSharedPtr application,
                                          ApplicationManager& app_mngr);
 
-  /**
-   * @brief SendUnsubscribeButtonNotification sends notification to HMI to
-   * remove button subscription for application
-   * @param button Button type
-   * @param application Application to unsubscribe
-   * @param app_mngr Application manager
-   */
-  static void SendUnsubscribeButtonNotification(
-      mobile_apis::ButtonName::eType button,
-      ApplicationSharedPtr application,
-      ApplicationManager& app_mngr);
-
   /**
    * @brief Sends HMI status notification to mobile
    * @param application application with changed HMI status

diff --git a/.../sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h b/.../sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_button_subscription_notification.h
diff --git a/...anager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_subscription_notification.cc b/...anager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_button_subscription_notification.cc
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
@@ -211,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"
@@ -779,10 +778,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>();
     }

diff --git a/...plication_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc b/...plication_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc
@@ -97,7 +97,6 @@
 #include "hmi/on_audio_data_streaming_notification.h"
 #include "hmi/on_button_event_notification.h"
 #include "hmi/on_button_press_notification.h"
-#include "hmi/on_button_subscription_notification.h"
 #include "hmi/on_device_chosen_notification.h"
 #include "hmi/on_device_state_changed_notification.h"
 #include "hmi/on_driver_distraction_notification.h"
@@ -450,7 +449,6 @@ typedef Types<commands::NaviIsReadyResponse,
 
 typedef Types<commands::hmi::OnButtonEventNotification,
               commands::hmi::OnButtonPressNotification,
-              commands::hmi::OnButtonSubscriptionNotification,
               commands::OnNaviTBTClientStateNotification,
               commands::hmi::OnUIKeyBoardInputNotification,
               commands::hmi::OnUITouchEventNotification,

diff --git a/...pplication_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc b/...pplication_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc
@@ -45,7 +45,6 @@
 #include "sdl_rpc_plugin/commands/hmi/on_audio_data_streaming_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"
@@ -343,7 +342,6 @@ class HMIOnNotificationsEventDispatcher
 
 typedef Types<OnAppPermissionChangedNotification,
               OnAudioDataStreamingNotification,
-              hmi::OnButtonSubscriptionNotification,
               OnFileRemovedNotification,
               OnPutFileNotification,
               OnResumeAudioSourceNotification,

diff --git a/...er/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc b/...er/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc
@@ -349,12 +349,6 @@ class RegisterAppInterfaceRequestTest
                     hmi_apis::FunctionID::BasicCommunication_OnAppRegistered),
                 _))
         .WillByDefault(Return(true));
-    ON_CALL(
-        mock_rpc_service_,
-        ManageHMICommand(
-            HMIResultCodeIs(hmi_apis::FunctionID::Buttons_OnButtonSubscription),
-            _))
-        .WillByDefault(Return(true));
   }
 
   void SetCommonPreconditionsToCheckWithPolicyData(MockAppPtr mock_app) {

diff --git a/src/components/application_manager/src/helpers/application_helper.cc b/src/components/application_manager/src/helpers/application_helper.cc
@@ -94,13 +94,19 @@ void DeleteGlobalProperties(ApplicationSharedPtr app,
 void DeleteButtonSubscriptions(ApplicationSharedPtr app,
                                ApplicationManager& app_manager) {
   ButtonSubscriptions buttons = app->SubscribedButtons().GetData();
-
   for (auto button : buttons) {
-    if (mobile_apis::ButtonName::CUSTOM_BUTTON == button) {
+    const auto hmi_button =
+        static_cast<hmi_apis::Common_ButtonName::eType>(button);
+    if (hmi_apis::Common_ButtonName::CUSTOM_BUTTON == hmi_button) {
       continue;
     }
-    MessageHelper::SendUnsubscribeButtonNotification(button, app, app_manager);
-    app->UnsubscribeFromButton(button);
+    smart_objects::SmartObjectSPtr unsubscribe_request =
+        MessageHelper::CreateButtonSubscriptionHandlingRequestToHmi(
+            app->app_id(),
+            hmi_button,
+            hmi_apis::FunctionID::Buttons_UnsubscribeButton,
+            app_manager);
+    app_manager.GetRPCService().ManageHMICommand(unsubscribe_request);
   }
 }
 

diff --git a/src/components/application_manager/src/hmi_interfaces_impl.cc b/src/components/application_manager/src/hmi_interfaces_impl.cc
@@ -43,8 +43,6 @@ generate_function_to_interface_convert_map() {
   convert_map[Buttons_GetCapabilities] = HmiInterfaces::HMI_INTERFACE_Buttons;
   convert_map[Buttons_OnButtonEvent] = HmiInterfaces::HMI_INTERFACE_Buttons;
   convert_map[Buttons_OnButtonPress] = HmiInterfaces::HMI_INTERFACE_Buttons;
-  convert_map[Buttons_OnButtonSubscription] =
-      HmiInterfaces::HMI_INTERFACE_Buttons;
   convert_map[Buttons_SubscribeButton] = HmiInterfaces::HMI_INTERFACE_Buttons;
   convert_map[Buttons_UnsubscribeButton] = HmiInterfaces::HMI_INTERFACE_Buttons;
   convert_map[BasicCommunication_OnReady] =