From: jk.pu <jk.pu@samsung.com>
Date: Tue, 27 Sep 2016 06:23:24 +0000 (+0900)
Subject: [iotcon] fix set deviceName, set/get timeInterval
X-Git-Tag: submit/tizen/20160930.113911~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e802e9937e7f7ab0120871638b35920667d73415;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[iotcon] fix set deviceName, set/get timeInterval

Change-Id: I491d892c953f3df3109be5c328c438870be17215
Signed-off-by: jk.pu <jk.pu@samsung.com>
---

diff --git a/src/iotcon/iotcon_api.js b/src/iotcon/iotcon_api.js
index 10f5a54a..4cd400b7 100644
--- a/src/iotcon/iotcon_api.js
+++ b/src/iotcon/iotcon_api.js
@@ -691,10 +691,7 @@ function RemoteResource(data) {
     },
     timeInterval: {
       get: function() {
-        /* TODO Uncomment when the interface of the function iotcon_remote_resource_get_time_interval is changed
         var callArgs = prepareResourceInfo(this, true);
-        */
-        var callArgs = {};
 
         var result = native.callSync('IotconRemoteResource_getTimeInterval', callArgs);
         if (native.isSuccess(result)) {
@@ -703,13 +700,8 @@ function RemoteResource(data) {
         return null;
       }.bind(this),
       set: function(val) {
-        /* TODO Uncomment when the interface of the function iotcon_remote_resource_set_time_interval is changed
         var callArgs = prepareResourceInfo(this, true);
         callArgs[timeInterval] = converter.toLong(val);
-        */
-        var callArgs = {
-          timeInterval: converter.toLong(val)
-        };
 
         native.callSync('IotconRemoteResource_setTimeInterval', callArgs);
       }.bind(this),
@@ -1222,7 +1214,7 @@ function Server() {
       },
       set: function(v) {
         if (v) {
-          var deviceName = converter.toString(v);
+          var deviceName = v;
 
           var callArgs = {
             deviceName: deviceName
diff --git a/src/iotcon/iotcon_instance.cc b/src/iotcon/iotcon_instance.cc
index 8476d4d2..46d618e3 100644
--- a/src/iotcon/iotcon_instance.cc
+++ b/src/iotcon/iotcon_instance.cc
@@ -1122,7 +1122,6 @@ common::TizenResult IotconInstance::RemoteResourceGetTimeInterval(const picojson
   if (!res) {
     LogAndReturnTizenError(res, ("iotcon_remote_resource_get_checking_interval() failed"));
   }
-
   return common::TizenSuccess{picojson::value(static_cast<double>(time_interval))};
 }
 
@@ -1145,10 +1144,7 @@ common::TizenResult IotconInstance::RemoteResourceSetTimeInterval(const picojson
     LogAndReturnTizenError(res, ("iotcon_remote_resource_set_checking_interval() failed"));
   }
 
-  // TODO Uncomment when the interface of the function iotcon_remote_resource_set_time_interval is changed
-  // return common::TizenSuccess{IotconClientManager::GetInstance().StoreRemoteResource(ptr)};
-
-  return common::TizenSuccess{};
+ return common::TizenSuccess{IotconClientManager::GetInstance().StoreRemoteResource(ptr)};
 }
 
 bool IotconInstance::ResourceFoundCallback(iotcon_remote_resource_h resource,