Diff: DeviceIntegration.cpp

Revision:

100:47ea098f8a47

Parent:

94:61d44636f020

Child:

101:dbcd3bc51758

--- a/DeviceIntegration.cpp	Thu May 07 09:57:55 2015 +0000
+++ b/DeviceIntegration.cpp	Thu May 07 13:56:19 2015 +0000
@@ -6,8 +6,7 @@
 #include "logging.h"
 
 DeviceIntegration::DeviceIntegration(AbstractSmartRest& client, SmartRestTemplate& tpl,
-    long& deviceId, DeviceInfo& deviceInfo) :
-    _deviceId(deviceId),
+    DeviceInfo& deviceInfo) :
     _tpl(tpl),
     _client(client),
     _deviceInfo(deviceInfo)
@@ -51,13 +50,12 @@
         return false;
 
     _init = true;
-    _deviceId = 0;
     return true;
 }
 
 bool DeviceIntegration::integrate()
 {
-    if (_deviceId != 0)
+    if (deviceID != 0)
         return false;
 
     // template bootstrapping process
@@ -110,7 +108,7 @@
         aError("Unknown message ID: %d.\n", received.value(0).integerValue());
         return false;
     }
-    _deviceId = received.value(2).integerValue();
+    setDeviceID(received.value(2).integerValue());
     
     return true;
 }
@@ -149,7 +147,7 @@
         return false;
     }
 
-    _deviceId = received.value(2).integerValue();
+    setDeviceID(received.value(2).integerValue());
     return true;
 }
 
@@ -161,9 +159,9 @@
     aInfo("Add global identifier.\n");
 
     IntegerValue msgId(102);
-    IntegerValue deviceId(_deviceId);
+    IntegerValue devId(deviceID);
     CharValue imei(_deviceInfo.imei());
-    if ((!record.add(msgId)) || (!record.add(deviceId)) || (!record.add(imei)))
+    if ((!record.add(msgId)) || (!record.add(devId)) || (!record.add(imei)))
         return false;
 
     if (_client.send(record) != SMARTREST_SUCCESS) {
@@ -198,12 +196,12 @@
     ParsedRecord received;
 
     IntegerValue msgId(103);
-    IntegerValue deviceId(_deviceId);
+    IntegerValue devId(deviceID);
     CharValue imei(_deviceInfo.imei());
     CharValue cellId(_deviceInfo.cellId());
     CharValue iccid(_deviceInfo.iccid());
     aInfo("Update Device.\n");
-    if ((!record.add(msgId)) || (!record.add(deviceId)) || (!record.add(imei)) || (!record.add(cellId)) || (!record.add(iccid)))
+    if ((!record.add(msgId)) || (!record.add(devId)) || (!record.add(imei)) || (!record.add(cellId)) || (!record.add(iccid)))
         return false;
 
     if (_client.send(record) != SMARTREST_SUCCESS) {