[BLE] fix startScan

[Verification] Code compiles without error

Change-Id: I8767ac6e1aacf56814b6cf4f3aa1e365dfc4ab1c
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>

diff --git a/src/bluetooth/bluetooth_api.js b/src/bluetooth/bluetooth_api.js
index eaae7d0..55b53d6 100755 (executable)
--- a/src/bluetooth/bluetooth_api.js
+++ b/src/bluetooth/bluetooth_api.js
@@ -149,7 +149,7 @@ tizen.BluetoothLEServiceData = function(d) {
   var data_ = '';
 
   Object.defineProperties(this, {
-    serviceuuid: {
+    uuid: {
       enumerable: true,
       get: function() {
         return uuid_;
@@ -170,10 +170,10 @@ tizen.BluetoothLEServiceData = function(d) {
   });
 
   if (arguments.length >= 2) {  // public constructor
-    this.serviceuuid = arguments[0];
+    this.uuid = arguments[0];
     this.data = arguments[1];
   } else if (d && T.isObject(d)) {  // internal constructor
-    this.serviceuuid = d.serviceuuid;
+    this.uuid = d.uuid;
     this.data = d.data;
   } else {
     uuid_ = undefined;
@@ -579,7 +579,7 @@ var BluetoothLEDevice = function(data) {
         address = data.address;
         name = data.name;
         txpowerLevel = data.txpowerLevel;
-        apperance = data.appearance;
+        appearance = data.appearance;
         uuids = data.uuids;
         solicitationuuids = data.solicitationuuids;
         data.serviceData.forEach(function(d) {
@@ -1324,6 +1324,7 @@ function _singleListenerBuilder(name, callback) {
 
 var _bleScanListener = _singleListenerBuilder('BluetoothLEScanCallback',
     function(event, successCallback, errorCallback) {
+
   var d;
   var ret = true;
 
@@ -1342,9 +1343,8 @@ var _bleScanListener = _singleListenerBuilder('BluetoothLEScanCallback',
       console.log('Unknown mode: ' + event.action);
       return ret;
   }
-
-  if (successCallback && successCallback[event.action]) {
-    successCallback[event.action](d);
+  if (successCallback) {
+    successCallback(d);
   }
 
   return ret;

diff --git a/src/bluetooth/bluetooth_le_device.cc b/src/bluetooth/bluetooth_le_device.cc
index 1bde58e..0551dcf 100755 (executable)
--- a/src/bluetooth/bluetooth_le_device.cc
+++ b/src/bluetooth/bluetooth_le_device.cc
@@ -40,7 +40,7 @@ const std::string kAppearance = "appearance";
 const std::string kDeviceUuids = "uuids";
 const std::string kSolicitationUuids = "solicitationuuids";
 const std::string kServiceData = "serviceData";
-const std::string kServiceUuids = "serviceuuids";
+const std::string kServiceUuid = "uuid";
 const std::string kManufacturerData = "manufacturerData";
 const std::string kId = "id";
 const std::string kData = "data";
@@ -97,7 +97,7 @@ static void ServiceDataToJson(bt_adapter_le_service_data_s *service_data_list,
   for (int i = 0; i < service_data_list_count; i++) {
     picojson::value response = picojson::value(picojson::object());
     picojson::object& response_obj = response.get<picojson::object>();
-    response_obj[kServiceUuids] = picojson::value(
+    response_obj[kServiceUuid] = picojson::value(
         std::string(service_data_list[i].service_uuid));
     response_obj[kData] = picojson::value(
         std::string(service_data_list[i].service_data,
@@ -147,15 +147,12 @@ PlatformResult BluetoothLEDevice::ToJson(
     }
   }
 
-  if (!found) {
-    return util::GetBluetoothError(ret, "Failed to get device name.");
-  }
-
-  le_device->insert(
-      std::make_pair(kDeviceName, picojson::value(std::string(device_name))));
-
-  g_free(device_name);
+  if (found) {
+    le_device->insert(
+        std::make_pair(kDeviceName, picojson::value(std::string(device_name))));
 
+    g_free(device_name);
+  }
   int power_level = 0;
   found = false;
   for (size_t i = 0; i < types.size() && !found; ++i) {
@@ -168,14 +165,11 @@ PlatformResult BluetoothLEDevice::ToJson(
     }
   }
 
-  if (!found) {
-    return util::GetBluetoothError(ret, "Failed to get txpower.");
-  }
-
-  le_device->insert(
+  if (found) {
+    le_device->insert(
       std::make_pair(kTxPowerLevel,
                      picojson::value(static_cast<double>(power_level))));
-
+  }
   int appearance = 0;
   found = false;
   for (size_t i = 0; i < types.size() && !found; ++i) {
@@ -187,14 +181,12 @@ PlatformResult BluetoothLEDevice::ToJson(
     }
   }
 
-  if (!found) {
-    return util::GetBluetoothError(ret, "Failed to get appearance.");
+  if (found) {
+    le_device->insert(
+        std::make_pair(kAppearance,
+                       picojson::value(static_cast<double>(appearance))));
   }
 
-  le_device->insert(
-      std::make_pair(kAppearance,
-                     picojson::value(static_cast<double>(appearance))));
-
   char **uuids = nullptr;
   int count = 0;
   found = false;
@@ -208,15 +200,13 @@ PlatformResult BluetoothLEDevice::ToJson(
     }
   }
 
-  if (!found) {
-    return util::GetBluetoothError(ret, "Failed to get uuids.");
-  }
-
-  UUIDsToJson(uuids, count, kDeviceUuids, le_device);
-  for (int i = 0; i < count; ++i) {
-    g_free(uuids[i]);
+  if (found) {
+    UUIDsToJson(uuids, count, kDeviceUuids, le_device);
+    for (int i = 0; i < count; ++i) {
+      g_free(uuids[i]);
+    }
+    g_free(uuids);
   }
-  g_free(uuids);
 
   char** service_solicitation_uuids = nullptr;
   int service_solicitation_uuids_count = 0;
@@ -234,16 +224,14 @@ PlatformResult BluetoothLEDevice::ToJson(
     }
   }
 
-  if (!found) {
-    return util::GetBluetoothError(ret, "Failed to get solicitation UUID.");
-  }
-
-  UUIDsToJson(service_solicitation_uuids, service_solicitation_uuids_count,
-              kSolicitationUuids, le_device);
-  for (int i = 0; i < service_solicitation_uuids_count; ++i) {
-    g_free(service_solicitation_uuids[i]);
+  if (found) {
+    UUIDsToJson(service_solicitation_uuids, service_solicitation_uuids_count,
+                kSolicitationUuids, le_device);
+    for (int i = 0; i < service_solicitation_uuids_count; ++i) {
+      g_free(service_solicitation_uuids[i]);
+    }
+    g_free(service_solicitation_uuids);
   }
-  g_free(service_solicitation_uuids);
 
   bt_adapter_le_service_data_s *serviceDataList = nullptr;
   int service_data_list_count = 0;
@@ -260,16 +248,13 @@ PlatformResult BluetoothLEDevice::ToJson(
     }
   }
 
-  if (!found) {
-    return util::GetBluetoothError(ret, "Failed to get device service data.");
-  }
-
-  ServiceDataToJson(serviceDataList, service_data_list_count, le_device);
-
-  ret = bt_adapter_le_free_service_data_list(serviceDataList,
+  if (found) {
+    ServiceDataToJson(serviceDataList, service_data_list_count, le_device);
+    ret = bt_adapter_le_free_service_data_list(serviceDataList,
                                              service_data_list_count);
-  if (BT_ERROR_NONE != ret) {
-    LoggerW("Failed to free service data list: %d", ret);
+    if (BT_ERROR_NONE != ret) {
+      LoggerW("Failed to free service data list: %d", ret);
+    }
   }
 
   int manufacturer_id = 0;
@@ -289,13 +274,11 @@ PlatformResult BluetoothLEDevice::ToJson(
     }
   }
 
-  if (!found) {
-    return util::GetBluetoothError(ret, "Failed to get device manufacturer.");
+  if (found) {
+    ManufacturerToJson(manufacturer_id, manufacturer_data,
+                       manufacturer_data_count, le_device);
+    g_free(manufacturer_data);
   }
-
-  ManufacturerToJson(manufacturer_id, manufacturer_data,
-                     manufacturer_data_count, le_device);
-  g_free(manufacturer_data);
   return PlatformResult(ErrorCode::NO_ERROR);
 }