11 files changed, 23 insertions(+), 15 deletions(-)

M products/BellHybrid/apps/Application.cpp
M products/BellHybrid/apps/application-bell-meditation-timer/ApplicationBellMeditationTimer.cpp
M products/BellHybrid/apps/application-bell-meditation-timer/include/application-bell-meditation-timer/ApplicationBellMeditationTimer.hpp
M products/BellHybrid/apps/application-bell-meditation-timer/presenter/IntervalChimePresenter.cpp
M products/BellHybrid/apps/application-bell-meditation-timer/presenter/MeditationProgressPresenter.cpp
M products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationRunningWindow.cpp
M products/BellHybrid/apps/application-bell-powernap/ApplicationBellPowerNap.cpp
M products/BellHybrid/apps/application-bell-powernap/include/application-bell-powernap/ApplicationBellPowerNap.hpp
M products/BellHybrid/apps/application-bell-powernap/presenter/PowerNapMainWindowPresenter.cpp
M products/BellHybrid/apps/application-bell-powernap/windows/PowerNapProgressWindow.cpp
M products/BellHybrid/apps/include/Application.hpp

@@ 133,7 133,9 @@ namespace app
 
     void Application::restartIdleTimer()
     {
-        bus.sendUnicast(std::make_shared<RestartIdleTimerMessage>(), service::name::appmgr);
+        if (idleTimerActiveFlag) {
+            bus.sendUnicast(std::make_shared<RestartIdleTimerMessage>(), service::name::appmgr);
+        }
     }
 
     void Application::stopIdleTimer()


@@ 143,4 145,15 @@ namespace app
 
     void Application::updateStatuses(gui::AppWindow *window) const
     {}
+
+    void Application::resumeIdleTimer()
+    {
+        startIdleTimer();
+        idleTimerActiveFlag = true;
+    }
+    void Application::suspendIdleTimer()
+    {
+        stopIdleTimer();
+        idleTimerActiveFlag = false;
+    }
 } // namespace app

@@ 83,8 83,4 @@ namespace app
 
         return handleAsyncResponse(resp);
     }
-
-    // Empty: do not start idleTimer on application run
-    void ApplicationBellMeditationTimer::onStart()
-    {}
 } // namespace app

@@ 41,9 41,6 @@ namespace app
         {
             return sys::ReturnCodes::Success;
         }
-
-      private:
-        void onStart() override;
     };
 
     template <> struct ManifestTraits<ApplicationBellMeditationTimer>

@@ 62,6 62,7 @@ namespace app::meditation
             if (option.second == value) {
                 settings->setValue(
                     intervalDBRecordName, utils::to_string(option.first.count()), settings::SettingsScope::AppLocal);
+                reinterpret_cast<app::Application *>(app)->suspendIdleTimer();
                 app->switchWindow(gui::name::window::readyGoing);
                 break;
             }


@@ 76,6 77,7 @@ namespace app::meditation
             utils::getNumericValue<int>(settings->getValue(meditationDBRecordName, settings::SettingsScope::AppLocal));
         if (duration == 1) {
             settings->setValue(intervalDBRecordName, utils::to_string(0), settings::SettingsScope::AppLocal);
+            reinterpret_cast<app::Application *>(app)->suspendIdleTimer();
             app->switchWindow(gui::name::window::readyGoing);
             return;
         }

@@ 44,6 44,7 @@ namespace app::meditation
 
     void MeditationProgressPresenter::start()
     {
+        reinterpret_cast<app::Application *>(app)->suspendIdleTimer();
         timer->reset(std::chrono::seconds(duration), std::chrono::seconds(interval));
         timer->start();
     }

@@ 126,6 126,7 @@ namespace gui
             return true;
         }
         if (inputEvent.isShortRelease(gui::KeyCode::KEY_RF)) {
+            reinterpret_cast<app::Application *>(application)->resumeIdleTimer();
             presenter->abandon();
             return true;
         }

@@ 73,8 73,4 @@ namespace app
 
         return handleAsyncResponse(resp);
     }
-
-    // Empty: do not start idleTimer on application run
-    void ApplicationBellPowerNap::onStart()
-    {}
 } // namespace app

@@ 44,9 44,6 @@ namespace app
         {
             return sys::ReturnCodes::Success;
         }
-
-      private:
-        void onStart() override;
     };
 
     template <> struct ManifestTraits<ApplicationBellPowerNap>

@@ 32,6 32,7 @@ namespace app::powernap
         const auto currentValue = model->getCurrentValue();
         settings->setValue(
             powernapDBRecordName, utils::to_string(currentValue.count()), settings::SettingsScope::AppLocal);
+        reinterpret_cast<app::Application *>(app)->suspendIdleTimer();
         app->switchWindow(gui::window::name::powernapProgress);
     }
 } // namespace app::powernap

@@ 109,6 109,7 @@ namespace gui
                 return true;
             }
             else if (not presenter->isNapFinished() && key == KeyMap::Back) {
+                reinterpret_cast<app::Application *>(application)->resumeIdleTimer();
                 presenter->endNap();
                 application->returnToPreviousWindow();
                 return true;

@@ 11,6 11,8 @@ namespace app
     {
       public:
         using ApplicationCommon::ApplicationCommon;
+        void resumeIdleTimer();
+        void suspendIdleTimer();
 
       protected:
         void attachPopups(const std::vector<gui::popup::ID> &popupsList) override;


@@ 30,5 32,6 @@ namespace app
         virtual void onKeyPressed();
         virtual void onStart();
         virtual void onStop();
+        bool idleTimerActiveFlag = true;
     };
 } // namespace app