~aleteoryx/muditaos

78a499e3bf220a8168d3600e3368669032b8a6a3 — Lefucjusz 3 years ago 57fa356
[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.
M module-apps/application-call/model/CallModel.cpp => module-apps/application-call/model/CallModel.cpp +2 -1
@@ 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;
        }

M module-apps/application-messages/windows/SMSTemplatesWindow.cpp => module-apps/application-messages/windows/SMSTemplatesWindow.cpp +2 -4
@@ 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<SMSTemplateRequest *>(data)) {
            smsTemplateRequestHandler(switchData);

M pure_changelog.md => pure_changelog.md +1 -0
@@ 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]