4 files changed, 48 insertions(+), 14 deletions(-)

M module-apps/application-settings-new/ApplicationSettings.cpp
M module-apps/application-settings-new/ApplicationSettings.hpp
M module-apps/application-settings-new/windows/AutolockWindow.cpp
M module-apps/application-settings-new/windows/AutolockWindow.hpp

@@ 406,7 406,7 @@ namespace app
             return std::make_unique<gui::PhoneNameWindow>(app);
         });
         windowsFactory.attach(gui::window::name::autolock, [](Application *app, const std::string &name) {
-            return std::make_unique<gui::AutolockWindow>(app);
+            return std::make_unique<gui::AutolockWindow>(app, static_cast<ApplicationSettingsNew *>(app));
         });
         windowsFactory.attach(gui::window::name::torch, [](Application *app, const std::string &name) {
             return std::make_unique<gui::TorchWindow>(app);


@@ 683,6 683,19 @@ namespace app
         CellularServiceAPI::SetConnectionFrequency(this, val);
     }
 
+    auto ApplicationSettingsNew::getAutoLockTime() const noexcept -> std::chrono::milliseconds
+    {
+        return std::chrono::milliseconds{utils::getNumericValue<unsigned int>(
+            settings->getValue(::settings::SystemProperties::lockTime, ::settings::SettingsScope::Global))};
+    }
+
+    void ApplicationSettingsNew::setAutoLockTime(std::chrono::milliseconds lockTime) noexcept
+    {
+        settings->setValue(::settings::SystemProperties::lockTime,
+                           std::to_string(lockTime.count()),
+                           ::settings::SettingsScope::Global);
+    }
+
     void ApplicationSettingsNew::switchToAllDevicesViaBtErrorPrompt(std::shared_ptr<sys::DataMessage> msg,
                                                                     const std::string &errorMsg)
     {

@@ 164,6 164,13 @@ namespace app
             virtual void setFlightMode(bool flightModeOn) noexcept = 0;
         };
 
+        class AutoLockSettings
+        {
+          public:
+            virtual auto getAutoLockTime() const noexcept -> std::chrono::milliseconds = 0;
+            virtual void setAutoLockTime(std::chrono::milliseconds lockTime) noexcept  = 0;
+        };
+
     }; // namespace settingsInterface
 
     class ApplicationSettingsNew : public app::Application,


@@ 175,6 182,7 @@ namespace app
                                    public settingsInterface::DndSettings,
                                    public settingsInterface::OfflineSettings,
                                    public settingsInterface::ConnectionSettings,
+                                   public settingsInterface::AutoLockSettings,
                                    public AsyncCallbackReceiver
     {
       public:


@@ 228,6 236,9 @@ namespace app
         auto getConnectionFrequency() const noexcept -> uint8_t override;
         void setConnectionFrequency(uint8_t val) noexcept override;
 
+        auto getAutoLockTime() const noexcept -> std::chrono::milliseconds override;
+        void setAutoLockTime(std::chrono::milliseconds lockTime) noexcept override;
+
       private:
         void attachQuotesWindows();
         void switchToAllDevicesViaBtErrorPrompt(std::shared_ptr<sys::DataMessage> msg, const std::string &errorMsg);

@@ 2,15 2,26 @@
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #include "AutolockWindow.hpp"
-#include "application-settings-new/ApplicationSettings.hpp"
 #include "OptionSetting.hpp"
 
 #include <i18n/i18n.hpp>
 
 namespace gui
 {
-
-    AutolockWindow::AutolockWindow(app::Application *app) : BaseSettingsWindow(app, window::name::autolock)
+    namespace
+    {
+        const std::vector<std::pair<std::string, std::chrono::milliseconds>> autoLockTimes = {
+            {"15s", std::chrono::milliseconds{15000}},
+            {"30s", std::chrono::milliseconds{30000}},
+            {"1m", std::chrono::milliseconds{60000}},
+            {"2m", std::chrono::milliseconds{120000}},
+            {"5m", std::chrono::milliseconds{300000}},
+            {"10m", std::chrono::milliseconds{600000}},
+            {"20m", std::chrono::milliseconds{1200000}}};
+    } // namespace
+
+    AutolockWindow::AutolockWindow(app::Application *app, app::settingsInterface::AutoLockSettings *autoLockSettings)
+        : BaseSettingsWindow(app, window::name::autolock), autoLockSettings(autoLockSettings)
     {
         setTitle(utils::translate("app_settings_display_locked_screen_autolock"));
     }


@@ 18,13 29,11 @@ namespace gui
     auto AutolockWindow::buildOptionsList() -> std::list<gui::Option>
     {
         std::list<gui::Option> optionsList;
-        std::vector<std::string> autoLockTimes = {"15s", "30s", "1m", "2m", "5m", "10m", "20m"};
-
-        for (auto time : autoLockTimes) {
+        for (const auto &[timeString, time] : autoLockTimes) {
             optionsList.emplace_back(std::make_unique<gui::option::OptionSettings>(
-                time,
+                timeString,
                 [=](gui::Item &item) {
-                    selectedTime = time;
+                    autoLockSettings->setAutoLockTime(time);
                     refreshOptionsList();
                     return true;
                 },


@@ 36,8 45,8 @@ namespace gui
                     return true;
                 },
                 this,
-                selectedTime == time ? gui::option::SettingRightItem::Checked
-                                     : gui::option::SettingRightItem::Disabled));
+                autoLockSettings->getAutoLockTime() == time ? gui::option::SettingRightItem::Checked
+                                                            : gui::option::SettingRightItem::Disabled));
         }
 
         return optionsList;

@@ 1,9 1,10 @@
-// Copyright (c) 2017-2020, Mudita Sp. z.o.o. All rights reserved.
+// Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 #pragma once
 
 #include "BaseSettingsWindow.hpp"
+#include <module-apps/application-settings-new/ApplicationSettings.hpp>
 
 namespace gui
 {


@@ 11,11 12,11 @@ namespace gui
     class AutolockWindow : public BaseSettingsWindow
     {
       public:
-        AutolockWindow(app::Application *app);
+        AutolockWindow(app::Application *app, app::settingsInterface::AutoLockSettings *autoLockSettings);
 
       private:
         auto buildOptionsList() -> std::list<Option> override;
 
-        std::string selectedTime;
+        app::settingsInterface::AutoLockSettings *autoLockSettings;
     };
 } // namespace gui