3 files changed, 20 insertions(+), 4 deletions(-)

M module-apps/application-phonebook/ApplicationPhonebook.cpp
M module-apps/application-phonebook/windows/PhonebookSearchResults.cpp
M module-apps/application-phonebook/windows/PhonebookSearchResults.hpp

@@ 15,6 15,8 @@
 #include "windows/PhonebookSearchResults.hpp"
 #include "windows/PhonebookIceContacts.hpp"
 #include "windows/PhonebookInputOptions.hpp"
+#include "service-appmgr/messages/SwitchBackRequest.hpp"
+#include "service-appmgr/Controller.hpp"
 #include <service-db/QueryMessage.hpp>
 #include <service-db/DBNotificationMessage.hpp>
 #include <utility>


@@ 38,9 40,15 @@ namespace app
                                                                           item->contact);
 
                     switchWindow(gui::window::name::multiple_numbers_select, std::move(data));
-                    return true;
                 }
-                return false;
+                else {
+                    std::unique_ptr<PhonebookSearchRequest> data = std::make_unique<PhonebookSearchRequest>();
+                    data->result                                 = item->contact;
+                    data->setDescription("PhonebookSearchRequest");
+                    return app::manager::Controller::switchBack(
+                        this, std::make_unique<app::manager::SwitchBackRequest>(GetName(), std::move(data)));
+                }
+                return true;
             };
             switchWindow(gui::name::window::main_window, std::move(data));
             return actionHandled();

@@ 2,6 2,7 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "PhonebookSearchResults.hpp"
+#include <Icon.hpp>
 #include "application-phonebook/ApplicationPhonebook.hpp"
 #include "application-phonebook/data/PhonebookStyle.hpp"
 


@@ 99,7 100,13 @@ namespace gui
             navBar->setActive(nav_bar::Side::Left, true);
             navBar->setText(nav_bar::Side::Left, utils::translate(style::strings::common::call));
             navBar->setActive(nav_bar::Side::Center, true);
-            navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::open));
+            if (searchResultsModel->customContactActivationCallback) {
+                navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::select));
+            }
+            else {
+                navBar->setText(nav_bar::Side::Center, utils::translate(style::strings::common::open));
+            }
+
             setFocusItem(searchResultList);
         }
         else {

@@ 7,10 7,11 @@
 #include "application-phonebook/models/PhonebookModel.hpp"
 #include "application-phonebook/widgets/PhonebookListView.hpp"
 #include <AppWindow.hpp>
-#include <Icon.hpp>
 
 namespace gui
 {
+    class Icon;
+
     class PhonebookSearchResults : public AppWindow
     {
       public: