BLE: fix NRF.getSecurityStatus() only returning privacy info while co…

…nnected
espruino · Dec 9, 2024 · 70701e0 · 70701e0
1 parent ebaa426
commit 70701e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -71,6 +71,7 @@
             Graphics: g.dump/asBMP can now output 16 bit images
             Crypto: Add support for AES CCM (enabled on Bangle.js 2) 
             Add Serial over SWD vis RTT (enabled on Bangle.js 2)
+            BLE: fix NRF.getSecurityStatus() only returning privacy info while connected
 
      2v24 : Bangle.js2: Add 'Bangle.touchRd()', 'Bangle.touchWr()'
             Bangle.js2: After Bangle.showTestScreen, put Bangle.js into a hard off state (not soft off)

diff --git a/targets/nrf5x/bluetooth.c b/targets/nrf5x/bluetooth.c
@@ -3411,6 +3411,9 @@ JsVar *jsble_get_security_status(uint16_t conn_handle) {
   if (conn_handle == m_peripheral_conn_handle) {
     jsvObjectSetChildAndUnLock(result, "connectionInterval", jsvNewFromInteger(blePeriphConnectionInterval));
   }
+#ifdef ESPR_BLE_PRIVATE_ADDRESS_SUPPORT
+  jsvObjectSetChildAndUnLock(result, "privacy", jsble_getPrivacy());
+#endif // ESPR_BLE_PRIVATE_ADDRESS_SUPPORT
   if (conn_handle == BLE_CONN_HANDLE_INVALID) {
     jsvObjectSetChildAndUnLock(result, "connected", jsvNewFromBool(false));
     return result;
@@ -3422,9 +3425,6 @@ JsVar *jsble_get_security_status(uint16_t conn_handle) {
     jsvObjectSetChildAndUnLock(result, "encrypted", jsvNewFromBool(status.encrypted));
     jsvObjectSetChildAndUnLock(result, "mitm_protected", jsvNewFromBool(status.mitm_protected));
     jsvObjectSetChildAndUnLock(result, "bonded", jsvNewFromBool(status.bonded));
-#ifdef ESPR_BLE_PRIVATE_ADDRESS_SUPPORT
-    jsvObjectSetChildAndUnLock(result, "privacy", jsble_getPrivacy());
-#endif // ESPR_BLE_PRIVATE_ADDRESS_SUPPORT
 #ifndef SAVE_ON_FLASH
     if (status.connected && conn_handle==m_peripheral_conn_handle)
       jsvObjectSetChildAndUnLock(result, "connected_addr", bleAddrToStr(m_peripheral_addr));