~aleteoryx/muditaos: [EGD-8168] Fix Fixed lock screen in Calendar and Meditation

bf305043a9f89f63ef67efc54302ede7513a149b — Kuba 4 years ago f6a3fcc

[EGD-8168] Fix Fixed lock screen in Calendar and Meditation

Fixed empty Lock screen in applications Caledar and Meditation.
Error was caused by not handled messages response at all.

patch browse .tar.gz

2 files changed, 8 insertions(+), 2 deletions(-)

M module-apps/application-calendar/ApplicationCalendar.cpp
M module-apps/application-meditation/ApplicationMeditation.cpp

M module-apps/application-calendar/ApplicationCalendar.cpp => module-apps/application-calendar/ApplicationCalendar.cpp +1 -1

@@ 22,7 22,7 @@ namespace app
         if (retMsg && (dynamic_cast<sys::ResponseMessage *>(retMsg.get())->retCode == sys::ReturnCodes::Success)) {
             return retMsg;
         }
-        return std::make_shared<sys::ResponseMessage>();
+        return handleAsyncResponse(resp);
     }
 
     sys::ReturnCodes ApplicationCalendar::InitHandler()

M module-apps/application-meditation/ApplicationMeditation.cpp => module-apps/application-meditation/ApplicationMeditation.cpp +7 -1

@@ 30,7 30,13 @@ namespace app
     auto ApplicationMeditation::DataReceivedHandler(sys::DataMessage *msgl, sys::ResponseMessage *resp)
         -> sys::MessagePointer
     {
-        return Application::DataReceivedHandler(msgl);
+        auto retMsg = Application::DataReceivedHandler(msgl);
+        // if message was handled by application's template there is no need to process further.
+        if (retMsg && (dynamic_cast<sys::ResponseMessage *>(retMsg.get())->retCode == sys::ReturnCodes::Success)) {
+            return retMsg;
+        }
+
+        return handleAsyncResponse(resp);
     }
 
     auto ApplicationMeditation::SwitchPowerModeHandler(sys::ServicePowerMode mode) -> sys::ReturnCodes