Merge branch 'master' into extended-easysetup

[platform/upstream/iotivity.git] / service / easy-setup / mediator / richsdk / src / RemoteEnrollee.cpp

diff --git a/service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp b/service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp
index a6491cc..24c9705 100755 (executable)
--- a/service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp
+++ b/service/easy-setup/mediator/richsdk/src/RemoteEnrollee.cpp
@@ -47,6 +47,8 @@ namespace OIC
             m_secProvisioningDbPathCb = nullptr;
             m_devicePropProvStatusCb = nullptr;
             m_cloudPropProvStatusCb = nullptr;
+
+            m_deviceId = resource->sid();
         }
 
 #ifdef __WITH_DTLS__
@@ -248,7 +250,7 @@ namespace OIC
             return ES_OK;
         }
 
-        void RemoteEnrollee::configureSecurity(SecurityProvStatusCb callback)
+        void RemoteEnrollee::provisionSecurity(SecurityProvStatusCb callback)
         {
 #ifdef __WITH_DTLS__
             m_securityProvStatusCb = callback;
@@ -417,10 +419,5 @@ namespace OIC
             m_cloudResource->registerCloudPropProvisioningStatusCallback(cloudPropProvStatusCb);
             m_cloudResource->provisionEnrollee(cloudProp);
         }
-
-        void RemoteEnrollee::setDevID(const std::string devId)
-        {
-            m_deviceId = devId;
-        }
     }
 }