From e6fe10e70d325a00b3687e9e705ec079c0b3810d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Zieli=C5=84ski?= Date: Mon, 20 Feb 2023 15:26:44 +0100 Subject: [PATCH] Revert "[MOS-357] Broken navigation around contact adding" This reverts commit 7a51a6f09bee138d620860d30c6d7daa1533213d. --- .../windows/PhonebookNewContact.cpp | 13 +------------ pure_changelog.md | 1 - 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/module-apps/application-phonebook/windows/PhonebookNewContact.cpp b/module-apps/application-phonebook/windows/PhonebookNewContact.cpp index b2f1e7578b2b08e589b6c37e104271f1f2adca6f..441ceb7428e3b85fffb4e88d13dd6555e3eac029 100644 --- a/module-apps/application-phonebook/windows/PhonebookNewContact.cpp +++ b/module-apps/application-phonebook/windows/PhonebookNewContact.cpp @@ -5,7 +5,6 @@ #include "DialogMetadata.hpp" #include "application-phonebook/ApplicationPhonebook.hpp" -#include #include #include @@ -120,16 +119,6 @@ namespace gui auto PhonebookNewContact::onInput(const InputEvent &inputEvent) -> bool { - auto backToCallLogIfCameFromThere = [this]() { - // MOS-357: conditionally (@see ApplicationManagerCommon::handleSwitchBack) return to call log - return app::manager::Controller::switchBack( - application, std::make_unique("ApplicationCallLog")); - }; - - if (inputEvent.isShortRelease(gui::KeyCode::KEY_RF)) { - return backToCallLogIfCameFromThere(); - } - auto ret = AppWindow::onInput(inputEvent); setSaveButtonVisible(!newContactModel->emptyData()); @@ -143,7 +132,7 @@ namespace gui newContactModel->saveData(contact); verifyAndSave(); - return backToCallLogIfCameFromThere(); + return true; } return ret; diff --git a/pure_changelog.md b/pure_changelog.md index 4fd019633634bc73efca7fe0ec0d6ded8c432ba6..3c629c035537be81bc2b8dabd8881b659e1a2360 100644 --- a/pure_changelog.md +++ b/pure_changelog.md @@ -75,7 +75,6 @@ * Fixed invalid screen displayed after missed call * Fixed minor issues in the Calculator Application * Fixed displaying usual SMS template call rejection window when no templates were defined -* Fixed going back to wrong window after confirming or cancelling creation of new contact from call log * Fixed misleading popup on SMS send when modem is rebooting * Fixed window redirection when clicking SMS icon * Fixed navigation through the ringtone preview list to automatically switch playback to the currently selected option