fix: Address PR Feedback

zfields · zfields · commit 20930b41253d · 2024-07-25T07:01:15.000-05:00
diff --git a/library.properties b/library.properties
@@ -7,4 +7,4 @@ paragraph=Originally part of ArduinoIoTCloud
 category=Communication
 url=https://github.com/arduino-libraries/Arduino_ConnectionHandler
 architectures=samd,esp32,esp8266,mbed,megaavr,mbed_nano,mbed_portenta,mbed_nicla,mbed_opta,mbed_giga,renesas_portenta,renesas_uno,mbed_edge,stm32
-depends=Arduino_DebugUtils, Blues Wireless Notecard (>=1.6.0), WiFi101, WiFiNINA, MKRGSM, MKRNB, MKRWAN
+depends=Arduino_DebugUtils, WiFi101, WiFiNINA, MKRGSM, MKRNB, MKRWAN, Blues Wireless Notecard (>=1.6.0)
diff --git a/src/Arduino_NotecardConnectionHandler.cpp b/src/Arduino_NotecardConnectionHandler.cpp
@@ -223,7 +223,7 @@ int NotecardConnectionHandler::syncSecretDeviceKey (const String & secret_device
     result = NotecardCommunicationError::NOTECARD_ERROR_GENERIC;
   } else if (J *req = _notecard.newRequest("var.set")) {
     JAddStringToObject(req, "file", NOTEFILE_SECURE_DATABASE);
-    JAddStringToObject(req, "name", "arduino_iot_cloud_secret_key");
+    JAddStringToObject(req, "name", "secret_device_key");
     if (secret_device_key_.length() > 0) {
       JAddStringToObject(req, "text", secret_device_key_.c_str());
     }
@@ -448,7 +448,6 @@ NetworkConnectionState NotecardConnectionHandler::update_handleInit()
   }
 #endif
 
-#if defined(BOARD_HAS_SECRET_KEY)
   // Set database template to support LoRa/Satellite Notecard
   if (NetworkConnectionState::INIT == result) {
     if (J *req = _notecard.newRequest("note.template")) {
@@ -483,7 +482,6 @@ NetworkConnectionState NotecardConnectionHandler::update_handleInit()
       result = NetworkConnectionState::ERROR; // Assume the worst
     }
   }
-#endif
 
   // Set inbound template to support LoRa/Satellite Notecard
   if (NetworkConnectionState::INIT == result) {

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ int NotecardConnectionHandler::syncSecretDeviceKey (const String & secret_device`
`223`	`223`	`result = NotecardCommunicationError::NOTECARD_ERROR_GENERIC;`
`224`	`224`	`} else if (J *req = _notecard.newRequest("var.set")) {`
`225`	`225`	`JAddStringToObject(req, "file", NOTEFILE_SECURE_DATABASE);`
`226`		`- JAddStringToObject(req, "name", "arduino_iot_cloud_secret_key");`
	`226`	`+ JAddStringToObject(req, "name", "secret_device_key");`
`227`	`227`	`if (secret_device_key_.length() > 0) {`
`228`	`228`	`JAddStringToObject(req, "text", secret_device_key_.c_str());`
`229`	`229`	`}`
`@@ -448,7 +448,6 @@ NetworkConnectionState NotecardConnectionHandler::update_handleInit()`
`448`	`448`	`}`
`449`	`449`	`#endif`
`450`	`450`
`451`		`-#if defined(BOARD_HAS_SECRET_KEY)`
`452`	`451`	`// Set database template to support LoRa/Satellite Notecard`
`453`	`452`	`if (NetworkConnectionState::INIT == result) {`
`454`	`453`	`if (J *req = _notecard.newRequest("note.template")) {`
`@@ -483,7 +482,6 @@ NetworkConnectionState NotecardConnectionHandler::update_handleInit()`
`483`	`482`	`result = NetworkConnectionState::ERROR; // Assume the worst`
`484`	`483`	`}`
`485`	`484`	`}`
`486`		`-#endif`
`487`	`485`
`488`	`486`	`// Set inbound template to support LoRa/Satellite Notecard`
`489`	`487`	`if (NetworkConnectionState::INIT == result) {`