From 78a499e3bf220a8168d3600e3368669032b8a6a3 Mon Sep 17 00:00:00 2001 From: Lefucjusz Date: Fri, 24 Feb 2023 16:19:03 +0100 Subject: [PATCH] [MOS-29] Fix invalid screen after rejecting with template Fix of the issue that rejecting call with template resulted in displaying 'Call ended' screen, while 'Call rejected' screen should be displayed. Fixed missing 'USE' label in templates window. --- module-apps/application-call/model/CallModel.cpp | 3 ++- .../application-messages/windows/SMSTemplatesWindow.cpp | 6 ++---- pure_changelog.md | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module-apps/application-call/model/CallModel.cpp b/module-apps/application-call/model/CallModel.cpp index 65110fce1191b093551d1805d9590d973a9c987d..e26a98eeafb6a5f2208164e5e36ebf7ce5016959 100644 --- a/module-apps/application-call/model/CallModel.cpp +++ b/module-apps/application-call/model/CallModel.cpp @@ -34,7 +34,8 @@ namespace app::call LOG_INFO("Dropping call state change"); } - if (callState == CallState::Incoming && newState == CallState::Ended && callWasRejected) { + if (((callState == CallState::Incoming) || (callState == CallState::Disconnecting)) && + (newState == CallState::Ended) && callWasRejected) { callWasRejected = false; callState = CallState::Rejected; } diff --git a/module-apps/application-messages/windows/SMSTemplatesWindow.cpp b/module-apps/application-messages/windows/SMSTemplatesWindow.cpp index fec2469f9a6c29b515d9525c094bf5b3bcb0eb53..b819cc1bd8f88bfa4f1862a0cee5a851c551c62a 100644 --- a/module-apps/application-messages/windows/SMSTemplatesWindow.cpp +++ b/module-apps/application-messages/windows/SMSTemplatesWindow.cpp @@ -105,10 +105,8 @@ namespace gui list->rebuildList(); } - if (list->isEmpty()) { - navBar->setActive(nav_bar::Side::Center, false); - emptyListIcon->setVisible(true); - } + navBar->setActive(nav_bar::Side::Center, !list->isEmpty()); + emptyListIcon->setVisible(list->isEmpty()); if (auto switchData = dynamic_cast(data)) { smsTemplateRequestHandler(switchData); diff --git a/pure_changelog.md b/pure_changelog.md index 6d6556599adabd85652200ec5852470177e44beb..33a40094374cd8bbb08fbcc6cf8a88fbe1081c27 100644 --- a/pure_changelog.md +++ b/pure_changelog.md @@ -91,6 +91,7 @@ * Fixed phonebook is not handling database notification about contacts action done by Center * Fixed contact deleted via Center cannot be edited by Phonebook app and saved again * Fixed returning to call screen from message template +* Fixed displaying wrong information on screen after rejecting call with SMS template ## [1.5.0 2022-12-20]