~aleteoryx/muditaos

45ce3ff5ac1289eb2288d6ce497108156b4aa789 — Mateusz Piesta 3 years ago 49a8d65
[BH-1353] Invalid snooze msg

Fixed invalid snooze msg.
M products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp => products/BellHybrid/apps/application-bell-main/presenters/StateController.cpp +2 -1
@@ 276,7 276,8 @@ namespace app::home_screen
                alarmModel.snooze();
                view.setHeaderViewMode(HeaderViewMode::SnoozeCountdown);
                view.setSnoozeTime(alarmModel.getTimeOfNextSnooze());
                const auto bottomDescription = utils::time::getBottomDescription(alarmModel.getSnoozeDuration());
                const auto bottomDescription =
                    utils::time::getBottomDescription(alarmModel.getSnoozeDuration().count());
                view.setBottomDescription(bottomDescription);
            };
            auto exit = [](AbstractPresenter &presenter) { presenter.detachTimer(); };

M products/BellHybrid/apps/common/include/common/models/AbstractAlarmModel.hpp => products/BellHybrid/apps/common/include/common/models/AbstractAlarmModel.hpp +13 -13
@@ 19,19 19,19 @@ namespace app
      public:
        virtual ~AbstractAlarmModel() noexcept = default;

        virtual bool isActive() const                      = 0;
        virtual void setDefaultAlarmTime()                 = 0;
        virtual void setAlarmTime(time_t time)             = 0;
        virtual time_t getAlarmTime() const                = 0;
        virtual void activate(bool value)                  = 0;
        virtual std::uint32_t getSnoozeDuration()          = 0;
        virtual bool isSnoozeAllowed()                     = 0;
        virtual bool isSnoozeActive()                      = 0;
        virtual void turnOff()                             = 0;
        virtual void snooze()                              = 0;
        virtual std::chrono::seconds getTimeToNextSnooze() = 0;
        virtual std::time_t getTimeOfNextSnooze()          = 0;
        virtual alarms::AlarmStatus getAlarmStatus()       = 0;
        virtual bool isActive() const                          = 0;
        virtual void setDefaultAlarmTime()                     = 0;
        virtual void setAlarmTime(time_t time)                 = 0;
        virtual time_t getAlarmTime() const                    = 0;
        virtual void activate(bool value)                      = 0;
        virtual std::chrono::seconds getSnoozeDuration() const = 0;
        virtual bool isSnoozeAllowed()                         = 0;
        virtual bool isSnoozeActive()                          = 0;
        virtual void turnOff()                                 = 0;
        virtual void snooze()                                  = 0;
        virtual std::chrono::seconds getTimeToNextSnooze()     = 0;
        virtual std::time_t getTimeOfNextSnooze()              = 0;
        virtual alarms::AlarmStatus getAlarmStatus()           = 0;
        /// Command model to update its internal data
        virtual void update(AlarmModelReadyHandler callback = AlarmModelReadyHandler()) = 0;
    };

M products/BellHybrid/apps/common/include/common/models/AlarmModel.hpp => products/BellHybrid/apps/common/include/common/models/AlarmModel.hpp +1 -1
@@ 32,7 32,7 @@ namespace app
        time_t getAlarmTime() const override;
        void activate(bool value) override;
        void update(AlarmModelReadyHandler callback) override;
        std::uint32_t getSnoozeDuration() override;
        std::chrono::seconds getSnoozeDuration() const override;
        bool isSnoozeAllowed() override;
        bool isSnoozeActive() override;
        void turnOff() override;

M products/BellHybrid/apps/common/src/AlarmModel.cpp => products/BellHybrid/apps/common/src/AlarmModel.cpp +2 -2
@@ 110,13 110,13 @@ namespace app
        }
        return alarmEventPtr->enabled;
    }
    std::uint32_t AlarmModel::getSnoozeDuration()
    std::chrono::seconds AlarmModel::getSnoozeDuration() const
    {
        const auto snoozeDurationStr =
            settings.getValue(bell::settings::Snooze::length, settings::SettingsScope::Global);
        const auto snoozeDuration = utils::getNumericValue<std::uint32_t>(snoozeDurationStr);

        return snoozeDuration;
        return std::chrono::minutes{snoozeDuration};
    }
    bool AlarmModel::isSnoozeAllowed()
    {