fix unregister method from service handler interface

That fix those TCT test cases :
- BluetoothServiceHandler_unregister_unregisterServiceRecord
- BluetoothServiceHandler_unregister_with_errorCallback
- BluetoothServiceHandler_unregister_with_successCallback

Change-Id: Iba21bb7c9ae9b30b741ac990451f88939503debb

diff --git a/bluetooth/bluetooth_api.js b/bluetooth/bluetooth_api.js
index cc1e80a..b235dc3 100644 (file)
--- a/bluetooth/bluetooth_api.js
+++ b/bluetooth/bluetooth_api.js
@@ -1040,7 +1040,7 @@ BluetoothServiceHandler.prototype.unregister = function(successCallback, errorCa
   };
 
   postMessage(msg, function(result) {
-    if (result.error != 0) {
+    if (result.error) {
       if (errorCallback) {
         var error = new tizen.WebAPIError(tizen.WebAPIException.UNKNOWN_ERR);
         errorCallback(error);
@@ -1050,8 +1050,6 @@ BluetoothServiceHandler.prototype.unregister = function(successCallback, errorCa
       return;
     }
 
-    _addConstProperty(this, 'isConnected', false);
-
     for (var i in adapter.service_handlers) {
       var service = adapter.service_handlers[i];
       if (service.server_fd == result.socket_fd)

diff --git a/bluetooth/bluetooth_instance_capi.cc b/bluetooth/bluetooth_instance_capi.cc
index a2af57e..39cb8b4 100644 (file)
--- a/bluetooth/bluetooth_instance_capi.cc
+++ b/bluetooth/bluetooth_instance_capi.cc
@@ -773,12 +773,18 @@ void BluetoothInstance::HandleCloseSocket(const picojson::value& msg) {
 
 void BluetoothInstance::HandleUnregisterServer(const picojson::value& msg) {
   int socket = static_cast<int>(msg.get("server_fd").get<double>());
+  int error = 0;
   LOG_DBG(socket);
-  CAPI(bt_socket_destroy_rfcomm(socket));
+
+  CAPI_ERR(bt_socket_destroy_rfcomm(socket), error);
 
   // CAPI calls callback only if there is a socket connected
-  if (socket_connected_map_[socket] = false) {
+  if (socket_connected_map_[socket] == false) {
     picojson::value::object o;
+    if (!error)
+      o["error"] = picojson::value(static_cast<double>(0));
+    else
+      o["error"] = picojson::value(static_cast<double>(1));
     o["cmd"] = picojson::value("");
     o["reply_id"] = msg.get("reply_id");
     o["socket_fd"] = picojson::value(static_cast<double>(socket));