From b4c679621e0c554054af3ffcd8aac4d603ca2e64 Mon Sep 17 00:00:00 2001
From: Piotr Kosko <p.kosko@samsung.com>
Date: Wed, 8 Jul 2015 14:41:47 +0200
Subject: [PATCH] [BluetoothLE] Fixes for BLE implementation

[Bugs] Added public constructor for BluetoothLEAdvertiseData.
  Changed member names according to widl.

[Verification] Code compiles without errors.
  TCT passrate increased to 96.77% (web-tct_2.3.1_r22)

Change-Id: Ic9909f7a02a3f69cf3497ded8a36aecafe23c885
Signed-off-by: Piotr Kosko <p.kosko@samsung.com>
---
 src/bluetooth/bluetooth_api.js       | 43 ++++++++++++++--------------
 src/bluetooth/bluetooth_extension.cc |  2 ++
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/bluetooth/bluetooth_api.js b/src/bluetooth/bluetooth_api.js
index 540058df..75f4981b 100755
--- a/src/bluetooth/bluetooth_api.js
+++ b/src/bluetooth/bluetooth_api.js
@@ -175,14 +175,15 @@ var BluetoothLEServiceData = function(d) {
 };
 
 //class BluetoothLEAdvertiseData ////////////////////////////////////////////////////
-var BluetoothLEAdvertiseData = function(dict) {
-  var includeName_;
-  var serviceuuids_;
-  var solicitationuuids_;
-  var appearance_;
-  var includeTxPowerLevel_;
-  var serviceData_;
-  var manufacturerData_;
+tizen.BluetoothLEAdvertiseData = function(dict) {
+  AV.isConstructorCall(this, tizen.BluetoothLEAdvertiseData);
+  var includeName_ = false;
+  var uuids_ = null;
+  var solicitationuuids_ = null;
+  var appearance_ = null;
+  var includeTxPowerLevel_ = false;
+  var serviceData_ = null;
+  var manufacturerData_ = null;
 
   Object.defineProperties(this, {
     includeName: {
@@ -194,21 +195,21 @@ var BluetoothLEAdvertiseData = function(dict) {
         includeName_ = Converter.toBoolean(v, true);
       }
     },
-    serviceuuids: {
+    uuids: {
       enumerable: true,
       get: function() {
-        return serviceuuids_;
+        return uuids_;
       },
       set: function(v) {
         if (T.isNull(v)) {
-          serviceuuids_ = v;
+          uuids_ = v;
         } else if (T.isArray(v)) {
           for (var i = 0; i < v.length; ++i) {
             if (!T.isString(v[i])) {
               v[i] = Converter.toString(v[i]);
             }
           }
-          serviceuuids_ = v;
+          uuids_ = v;
         }
       }
     },
@@ -289,17 +290,17 @@ var BluetoothLEAdvertiseData = function(dict) {
       return;
     }
 
-    // serviceuuids
-    if (T.isNull(dict.serviceuuids)) {
-      o.serviceuuids = dict.serviceuuids;
-    } else if (T.isArray(dict.serviceuuids)) {
-      for (var i = 0; i < dict.serviceuuids.length; ++i) {
-        if (!T.isString(dict.serviceuuids[i])) {
+    // uuids
+    if (T.isNull(dict.uuids)) {
+      o.uuids = dict.uuids;
+    } else if (T.isArray(dict.uuids)) {
+      for (var i = 0; i < dict.uuids.length; ++i) {
+        if (!T.isString(dict.uuids[i])) {
           return;
         }
       }
-      o.serviceuuids = dict.serviceuuids;
-    } else if (!T.isUndefined(dict.serviceuuids)) {
+      o.uuids = dict.uuids;
+    } else if (!T.isUndefined(dict.uuids)) {
       return;
     }
 
@@ -1421,7 +1422,7 @@ BluetoothLEAdapter.prototype.startAdvertise = function() {
   var args = AV.validateMethod(arguments, [{
     name: 'advertiseData',
     type: AV.Types.PLATFORM_OBJECT,
-    values: BluetoothLEAdvertiseData
+    values: tizen.BluetoothLEAdvertiseData
   }, {
     name: 'packetType',
     type: AV.Types.ENUM,
diff --git a/src/bluetooth/bluetooth_extension.cc b/src/bluetooth/bluetooth_extension.cc
index ba27f487..5f21b96a 100755
--- a/src/bluetooth/bluetooth_extension.cc
+++ b/src/bluetooth/bluetooth_extension.cc
@@ -19,6 +19,7 @@
 
 namespace {
 const char* kBluetooth = "tizen.bluetooth";
+const char* kBluetoothLEAdvertiseData = "tizen.BluetoothLEAdvertiseData";
 }
 // This will be generated from bluetooth_api.js.
 extern const char kSource_bluetooth_api[];
@@ -31,6 +32,7 @@ BluetoothExtension::BluetoothExtension() {
   SetExtensionName(kBluetooth);
   SetJavaScriptAPI(kSource_bluetooth_api);
   const char* entry_points[] = {
+      kBluetoothLEAdvertiseData,
       NULL
   };
   SetExtraJSEntryPoints(entry_points);
-- 
2.34.1