Turning _deice_id into a private member variable with setters/getters

Author: aentinger

src/ArduinoIoTCloud.h

@@ -84,9 +84,10 @@ class ArduinoIoTCloudClass
     virtual int connected      () = 0;
     virtual void printDebugInfo() = 0;
 
-    inline void   setThingId (String const thing_id) { _thing_id = thing_id; };
-    inline String getThingId () const                { return _thing_id; };
-    inline String getDeviceId() const                { return _device_id; };
+    inline void     setThingId (String const thing_id)  { _thing_id = thing_id; };
+    inline String & getThingId ()                       { return _thing_id; };
+    inline void     setDeviveId(String const device_id) { _device_id = device_id; };
+    inline String & getDeviceId()                       { return _device_id; };
 
     void addCallback(ArduinoIoTCloudEvent const event, OnCloudEventCallback callback);
 
@@ -130,8 +131,6 @@ class ArduinoIoTCloudClass
 
     inline ArduinoIoTConnectionStatus getIoTStatus() { return _iotStatus; }
 
-    String _device_id = "";
-
     ArduinoIoTConnectionStatus _iotStatus = ArduinoIoTConnectionStatus::IDLE;
     ArduinoIoTSynchronizationStatus _syncStatus = ArduinoIoTSynchronizationStatus::SYNC_STATUS_SYNCHRONIZED;
 
@@ -149,6 +148,7 @@ class ArduinoIoTCloudClass
   private:
 
     String _thing_id = "";
+    String _device_id = "";
 };
 
 #ifdef HAS_TCP

src/ArduinoIoTCloudTCP.cpp

@@ -97,9 +97,9 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) {
   _brokerPort = brokerPort;
 
   #ifdef BOARD_HAS_ECCX08
-  if (!ECCX08.begin())                                                                                                                                                    { Debug.print(DBG_ERROR, "Cryptography processor failure. Make sure you have a compatible board."); return 0; }
-  if (!CryptoUtil::readDeviceId(ECCX08, _device_id, ECCX08Slot::DeviceId))                                                                                                { Debug.print(DBG_ERROR, "Cryptography processor read failure."); return 0; }
-  if (!CryptoUtil::reconstructCertificate(_eccx08_cert, _device_id, ECCX08Slot::Key, ECCX08Slot::CompressedCertificate, ECCX08Slot::SerialNumberAndAuthorityKeyIdentifier)) { Debug.print(DBG_ERROR, "Cryptography certificate reconstruction failure."); return 0; }
+  if (!ECCX08.begin())                                                                                                                                                         { Debug.print(DBG_ERROR, "Cryptography processor failure. Make sure you have a compatible board."); return 0; }
+  if (!CryptoUtil::readDeviceId(ECCX08, getDeviceId(), ECCX08Slot::DeviceId))                                                                                                  { Debug.print(DBG_ERROR, "Cryptography processor read failure."); return 0; }
+  if (!CryptoUtil::reconstructCertificate(_eccx08_cert, getDeviceId(), ECCX08Slot::Key, ECCX08Slot::CompressedCertificate, ECCX08Slot::SerialNumberAndAuthorityKeyIdentifier)) { Debug.print(DBG_ERROR, "Cryptography certificate reconstruction failure."); return 0; }
   ArduinoBearSSL.onGetTime(getTime);
   _sslClient = new BearSSLClient(_connection->getClient(), ArduinoIoTCloudTrustAnchor, ArduinoIoTCloudTrustAnchor_NUM);
   _sslClient->setEccSlot(static_cast<int>(ECCX08Slot::Key), _eccx08_cert.bytes(), _eccx08_cert.length());
@@ -110,12 +110,12 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) {
 
   _mqttClient = new MqttClient(*_sslClient);
   #ifdef BOARD_ESP
-  _mqttClient->setUsernamePassword(_device_id, _password);
+  _mqttClient->setUsernamePassword(getDeviceId(), _password);
   #endif
   _mqttClient->onMessage(ArduinoIoTCloudTCP::onMessage);
   _mqttClient->setKeepAliveInterval(30 * 1000);
   _mqttClient->setConnectionTimeout(1500);
-  _mqttClient->setId(_device_id.c_str());
+  _mqttClient->setId(getDeviceId().c_str());
 
   _stdinTopic     = getTopic_stdin();
   _stdoutTopic    = getTopic_stdout();

src/ArduinoIoTCloudTCP.h

@@ -70,7 +70,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
 
     #ifdef BOARD_ESP
     inline void setBoardId(String const device_id) {
-      _device_id = device_id;
+      setDeviveId(device_id);
     }
     inline void setSecretDeviceKey(String const password) {
       _password = password;
@@ -119,12 +119,12 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
     String _dataTopicOut;
     String _dataTopicIn;
 
-    inline String getTopic_stdin    () const { return String("/a/d/" + _device_id + "/s/i"); }
-    inline String getTopic_stdout   () const { return String("/a/d/" + _device_id + "/s/o"); }
-    inline String getTopic_shadowout() const { return ( getThingId().length() == 0) ? String("")                            : String("/a/t/" + getThingId() + "/shadow/o"); }
-    inline String getTopic_shadowin () const { return ( getThingId().length() == 0) ? String("")                            : String("/a/t/" + getThingId() + "/shadow/i"); }
-    inline String getTopic_dataout  () const { return ( getThingId().length() == 0) ? String("/a/d/" + _device_id + "/e/o") : String("/a/t/" + getThingId() + "/e/o"); }
-    inline String getTopic_datain   () const { return ( getThingId().length() == 0) ? String("/a/d/" + _device_id + "/e/i") : String("/a/t/" + getThingId() + "/e/i"); }
+    inline String getTopic_stdin    () { return String("/a/d/" + getDeviceId() + "/s/i"); }
+    inline String getTopic_stdout   () { return String("/a/d/" + getDeviceId() + "/s/o"); }
+    inline String getTopic_shadowout() { return ( getThingId().length() == 0) ? String("")                            : String("/a/t/" + getThingId() + "/shadow/o"); }
+    inline String getTopic_shadowin () { return ( getThingId().length() == 0) ? String("")                            : String("/a/t/" + getThingId() + "/shadow/i"); }
+    inline String getTopic_dataout  () { return ( getThingId().length() == 0) ? String("/a/d/" + getDeviceId() + "/e/o") : String("/a/t/" + getThingId() + "/e/o"); }
+    inline String getTopic_datain   () { return ( getThingId().length() == 0) ? String("/a/d/" + getDeviceId() + "/e/i") : String("/a/t/" + getThingId() + "/e/i"); }
 
     static void onMessage(int length);
     void handleMessage(int length);