Reducing number of dbusclients in SelectActivity

Change-Id: I98bc88b1a7db9a33e1f054b2e507ea19f123f5f4

diff --git a/src/SelectActivity.cpp b/src/SelectActivity.cpp
index ed0851f..1d3d993 100644 (file)
--- a/src/SelectActivity.cpp
+++ b/src/SelectActivity.cpp
@@ -104,7 +104,6 @@ private:
        std::unique_ptr<Evas_Object, void(*)(Evas_Object *)> popup;
        std::unique_ptr<Evas_Object, void(*)(Evas_Object *)> virtualBackButton;
        DBus::DBusClient dbusClient;
-       DBus::DBusClient dbusClient2;
        VConfInterface::CallbackHandle autoTapWaitingPeriodCallbackHandle;
        ecore::Timer timer;
        double autoTapWaitingPeriod;
@@ -115,14 +114,12 @@ private:
 SelectActivity::SelectActivity(): UIActivity(activityType), popup(nullptr, evas_object_del),
        virtualBackButton(nullptr, evas_object_del), autoTapWaitingPeriod(AUTO_TAP_WAITING_PERIOD_DEFAULT_TIME)
 {
-       // TODO: Creating dbusClient2 is an ugly way to make signals below work properly.
-       // This TEMPORARY solution must be removed during refactor of SelectActivity.
-       dbusClient2 = DBus::DBusClient{dbusLocators::accessibilityEMod::BUS, dbusLocators::accessibilityEMod::OBJ_PATH, dbusLocators::accessibilityEMod::INTERFACE, DBus::ConnectionType::SYSTEM};
+       dbusClient = DBus::DBusClient{dbusLocators::accessibilityEMod::BUS, dbusLocators::accessibilityEMod::OBJ_PATH, dbusLocators::accessibilityEMod::INTERFACE, DBus::ConnectionType::SYSTEM};
 
-       dbusClient2.addSignal<void(int, int)>(dbusLocators::accessibilityEMod::MENU_MOUSE_DOWN_SIGNAL, [this](auto x, auto y) {
+       dbusClient.addSignal<void(int, int)>(dbusLocators::accessibilityEMod::MENU_MOUSE_DOWN_SIGNAL, [this](auto x, auto y) {
                checkedMenuItem = this->findActivityInMenu(x, y);
        });
-       dbusClient2.addSignal<void(int, int)>(dbusLocators::accessibilityEMod::MENU_MOUSE_UP_SIGNAL, [this](auto x, auto y) {
+       dbusClient.addSignal<void(int, int)>(dbusLocators::accessibilityEMod::MENU_MOUSE_UP_SIGNAL, [this](auto x, auto y) {
                auto act = this->findActivityInMenu(x, y);
                if (act == checkedMenuItem) {
                        for (auto &it : gengridItemsData) {
@@ -261,8 +258,6 @@ void SelectActivity::createMenu()
        elm_popup_orient_set(popup.get(), menu->getAlignment() == Alignment::BOTTOM ? ELM_POPUP_ORIENT_BOTTOM : ELM_POPUP_ORIENT_CENTER);
        createMenuContent();
 
-       dbusClient = DBus::DBusClient{dbusLocators::accessibilityEMod::BUS,
-                                                                 dbusLocators::accessibilityEMod::OBJ_PATH, dbusLocators::accessibilityEMod::INTERFACE, DBus::ConnectionType::SYSTEM};
        dbusClient.method<void(bool)>(dbusLocators::accessibilityEMod::BACK_BUTTON_INTERCEPTION_ENABLED).call(true);
        dbusClient.addSignal<void()>(dbusLocators::accessibilityEMod::BACK_BUTTON_UP_SIGNAL, [this]() {
                markAsCompleted();
@@ -310,7 +305,6 @@ void SelectActivity::removeMenu()
        if (dbusClient) {
                dbusClient.method<void(bool)>(dbusLocators::accessibilityEMod::BACK_BUTTON_INTERCEPTION_ENABLED).call(false);
                dbusClient.method<void(bool)>(dbusLocators::accessibilityEMod::MENU_IS_SHOWN).call(false, 0, 0, 0, 0);
-               dbusClient = {};
        }
 
        auto navIface = Singleton<UniversalSwitch>::instance().getNavigationInterface();