From 5d545e5704c27f101ac13b8cb4a3a3d120da5c39 Mon Sep 17 00:00:00 2001
From: iranl <iranl@users.noreply.github.com>
Date: Tue, 12 Mar 2024 20:24:17 +0100
Subject: [PATCH] Update

---
 NukiOpenerWrapper.cpp | 17 +++++++----------
 NukiOpenerWrapper.h   |  9 +--------
 NukiWrapper.cpp       |  1 +
 NukiWrapper.h         | 10 +---------
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/NukiOpenerWrapper.cpp b/NukiOpenerWrapper.cpp
index fd4867f..32bed68 100644
--- a/NukiOpenerWrapper.cpp
+++ b/NukiOpenerWrapper.cpp
@@ -7,6 +7,7 @@
 #include <NukiOpenerUtils.h>
 
 NukiOpenerWrapper* nukiOpenerInst;
+Preferences* nukiOpenerPreferences = nullptr;
 
 NukiOpenerWrapper::NukiOpenerWrapper(const std::string& deviceName, NukiDeviceId* deviceId, BleScanner::Scanner* scanner, NetworkOpener* network, Gpio* gpio, Preferences* preferences)
 : _deviceName(deviceName),
@@ -60,15 +61,6 @@ void NukiOpenerWrapper::initialize()
     _retryDelay = _preferences->getInt(preference_command_retry_delay);
     _rssiPublishInterval = _preferences->getInt(preference_rssi_publish_interval) * 1000;
 
-    _aclActRTO = _preferences->getBool(preference_acl_act_rto);
-    _aclDeactRTO = _preferences->getBool(preference_acl_deact_rto);
-    _aclESA = _preferences->getBool(preference_acl_act_esa);
-    _aclActCM = _preferences->getBool(preference_acl_act_cm);
-    _aclDeactCM = _preferences->getBool(preference_acl_deact_cm);
-    _aclFob1 = _preferences->getBool(preference_acl_opn_fob1);
-    _aclFob2 = _preferences->getBool(preference_acl_opn_fob2);
-    _aclFob3 = _preferences->getBool(preference_acl_opn_fob3);
-
     if(_retryDelay <= 100)
     {
         _retryDelay = 100;
@@ -499,11 +491,16 @@ LockActionResult NukiOpenerWrapper::onLockActionReceivedCallback(const char *val
         return LockActionResult::UnknownAction;
     }
     
-    if((action == NukiOpener::LockAction::ActivateRTO && _preferences->getBool(preference_acl_act_rto)) || (action == NukiOpener::LockAction::DeactivateRTO && _preferences->getBool(preference_acl_deact_rto)) || (action == NukiOpener::LockAction::ElectricStrikeActuation && _preferences->getBool(preference_acl_act_esa)) || (action == NukiOpener::LockAction::ActivateCM && _preferences->getBool(preference_acl_act_cm)) || (action == NukiOpener::LockAction::DeactivateCM && _preferences->getBool(preference_acl_deact_cm)) || (action == NukiOpener::LockAction::FobAction1 && _preferences->getBool(preference_acl_opn_fob1)) || (action == NukiOpener::LockAction::FobAction2 && _preferences->getBool(preference_acl_opn_fob2)) || (action == NukiOpener::LockAction::FobAction3 && _preferences->getBool(preference_acl_opn_fob3)))
+    nukiOpenerPreferences = new Preferences();
+    nukiOpenerPreferences->begin("nukihub", true);
+    
+    if((action == NukiOpener::LockAction::ActivateRTO && nukiOpenerPreferences->getBool(preferenceaclactrto)) || (action == NukiOpener::LockAction::DeactivateRTO && nukiOpenerPreferences->getBool(preferenceacldeactrto)) || (action == NukiOpener::LockAction::ElectricStrikeActuation && nukiOpenerPreferences->getBool(preferenceaclactesa)) || (action == NukiOpener::LockAction::ActivateCM && nukiOpenerPreferences->getBool(preferenceaclactcm)) || (action == NukiOpener::LockAction::DeactivateCM && nukiOpenerPreferences->getBool(preferenceacldeactcm)) || (action == NukiOpener::LockAction::FobAction1 && nukiOpenerPreferences->getBool(preferenceaclopnfob1)) || (action == NukiOpener::LockAction::FobAction2 && nukiOpenerPreferences->getBool(preferenceaclopnfob2)) || (action == NukiOpener::LockAction::FobAction3 && nukiOpenerPreferences->getBool(preferenceaclopnfob3)))
     {
+        nukiOpenerPreferences->end();
         return LockActionResult::Success;
     }
 
+    nukiOpenerPreferences->end();
     return LockActionResult::AccessDenied;
 }
 
diff --git a/NukiOpenerWrapper.h b/NukiOpenerWrapper.h
index 0c92e45..fd5e4b3 100644
--- a/NukiOpenerWrapper.h
+++ b/NukiOpenerWrapper.h
@@ -104,14 +104,7 @@ private:
     bool _nukiAdvancedConfigValid = false;
     bool _hassEnabled = false;
     bool _hassSetupCompleted = false;
-    bool _aclActRTO = false;
-    bool _aclDeactRTO = false;
-    bool _aclESA = false;
-    bool _aclActCM = false;
-    bool _aclDeactCM = false;
-    bool _aclFob1 = false;
-    bool _aclFob2 = false;
-    bool _aclFob3 = false;
+
     bool _paired = false;
     bool _statusUpdated = false;
     bool _hasKeypad = false;
diff --git a/NukiWrapper.cpp b/NukiWrapper.cpp
index 8481e08..0c1626b 100644
--- a/NukiWrapper.cpp
+++ b/NukiWrapper.cpp
@@ -7,6 +7,7 @@
 #include <NukiLockUtils.h>
 
 NukiWrapper* nukiInst;
+Preferences* preferences = nullptr;
 
 NukiWrapper::NukiWrapper(const std::string& deviceName, NukiDeviceId* deviceId, BleScanner::Scanner* scanner, NetworkLock* network, Gpio* gpio, Preferences* preferences)
 : _deviceName(deviceName),
diff --git a/NukiWrapper.h b/NukiWrapper.h
index 02d722d..7ff26f4 100644
--- a/NukiWrapper.h
+++ b/NukiWrapper.h
@@ -98,15 +98,7 @@ private:
     bool _nukiAdvancedConfigValid = false;
     bool _hassEnabled = false;
     bool _hassSetupCompleted = false;
-    bool _aclLock = false;
-    bool _aclUnlock = false;
-    bool _aclUnlatch = false;
-    bool _aclLockNGo = false;
-    bool _aclLockNGoU = false;
-    bool _aclFLock = false;
-    bool _aclFob1 = false;
-    bool _aclFob2 = false;
-    bool _aclFob3 = false;
+
     bool _paired = false;
     bool _statusUpdated = false;
     bool _hasKeypad = false;