Update change log and spec for wrt-plugins-tizen_0.4.70

[framework/web/wrt-plugins-tizen.git] / src / Bluetooth / BluetoothAdapter.cpp

diff --git a/src/Bluetooth/BluetoothAdapter.cpp b/src/Bluetooth/BluetoothAdapter.cpp
index ba9a1a5..bd5436f 100644 (file)
--- a/src/Bluetooth/BluetoothAdapter.cpp
+++ b/src/Bluetooth/BluetoothAdapter.cpp
@@ -21,7 +21,7 @@
 #include <JSWebAPIErrorFactory.h>
 #include <JSUtil.h>
 #include <TimeTracer.h>
-
+#include "plugin_config_impl.h"
 #include "BluetoothAdapter.h"
 #include "BluetoothCallbackUtil.h"
 #include "JSBluetoothDevice.h"
@@ -310,6 +310,7 @@ void BluetoothAdapter::onDiscoveryStateChangedCB(int result, bt_adapter_device_d
                 if(result == BT_ERROR_NONE) {
                     // create BluetoothDevice
                     BluetoothDeviceSharedPtr device(new BluetoothDevice(discoveryInfo));
+                                       device->copyAceCheckAccessFunction(getInstance());
                     JSContextRef context = callback->getContext();
                     JSObjectRef deviceObj = JSBluetoothDevice::createJSObject(context, device);
                     object->mFoundDevices.push_back(device);
@@ -367,6 +368,7 @@ bool BluetoothAdapter::foreachBondedDevicesCB(bt_device_info_s *deviceInfo, void
 
     if(iter == adapter->knownDevices.end()) {
         BluetoothDeviceSharedPtr device(new BluetoothDevice(deviceInfo));
+               device->copyAceCheckAccessFunction(getInstance());
         adapter->knownDevices.push_back(device);        
     }
 
@@ -397,6 +399,7 @@ void BluetoothAdapter::onBondCreatedCB(int result, bt_device_info_s *deviceInfo,
         if(result == BT_ERROR_NONE && deviceInfo != NULL) {
             if(callback) {
                 BluetoothDeviceSharedPtr device(new BluetoothDevice(deviceInfo));
+                               device->copyAceCheckAccessFunction(getInstance());
                 JSContextRef context = callback->getContext();
                 JSObjectRef deviceObj = JSBluetoothDevice::createJSObject(context, device);
                 callback->invokeCallback("success", deviceObj);
@@ -495,7 +498,7 @@ void BluetoothAdapter::onSocketConnected(int result, bt_socket_connection_state_
                 service->setConnectionState(true);
 
                 // Call BluetoothServiceHandler.onconnect
-                BluetoothSocketPtr socket = new BluetoothSocket(connection);
+                BluetoothSocketPtr socket = new BluetoothSocket(connection, getInstance());
                 MultiCallbackUserDataPtr callback = service->getOnConnect();
                 JSContextRef context = callback->getContext();
                 JSObjectRef socketObj = JSBluetoothSocket::createJSObject(context, socket);
@@ -559,7 +562,8 @@ void BluetoothAdapter::onSocketConnected(int result, bt_socket_connection_state_
 
             if(result == BT_ERROR_NONE) {
                 // Update mConnectedSocket
-                BluetoothSocketPtr socket = new BluetoothSocket(connection);
+                BluetoothSocketPtr socket = new BluetoothSocket(connection, getInstance());
+
                 object->mConnectedSocket.insert(std::pair<int, BluetoothSocketPtr>(connection->socket_fd, socket));
                 bt_socket_set_data_received_cb(onSocketReceivedCB, userData);
 
@@ -655,6 +659,8 @@ void BluetoothAdapter::onSocketReceivedCB(bt_socket_received_data_s *data, void
 BluetoothAdapter::BluetoothAdapter(): 
         mEnabled(false), mVisible(false)
 {
+       Common::SecurityAccessor();
+       
     bt_adapter_state_e state;
     if (bt_adapter_get_state(&state) == BT_ERROR_NONE) {
         if (state == BT_ADAPTER_ENABLED) {
@@ -706,6 +712,8 @@ BluetoothAdapter::~BluetoothAdapter()
     mConnReqMap.clear();
     mFoundDevices.clear();
     mConnectedSocket.clear();
+       
+       
 }
 
 void BluetoothAdapter::unloadFrame(JSContextRef context)
@@ -1414,11 +1422,12 @@ void BluetoothAdapter::returnKnownDevices(Common::MultiCallbackUserDataPtr userD
         knownDevices = mFoundDevices;
         if(bt_adapter_foreach_bonded_device(foreachBondedDevicesCB, this) == BT_ERROR_NONE) {
             if(knownDevices.size() > 0) { // There are found devices
-                LoggerD("There are found devices");                        
+
                 int num = knownDevices.size();
+                LoggerD("There are found devices " << num);                        
                 JSObjectRef devices[num];
                 for(int i = 0; i < num; i++) {
-                    JSObjectRef deviceObj = JSBluetoothDevice::createJSObject(userData->getContext(), knownDevices[i]);                        
+                    JSObjectRef deviceObj = JSBluetoothDevice::createJSObject(userData->getContext(), knownDevices[i]);          
                     devices[i] = deviceObj;
                 }
 
@@ -1462,6 +1471,7 @@ void BluetoothAdapter::returnDevice(std::string &address, Common::MultiCallbackU
                 deviceInfo != NULL) {  
             TIME_TRACER_ITEM_END("returnDevice::bt_adapter_get_bonded_device_info", 1);
             BluetoothDeviceSharedPtr device(new BluetoothDevice(deviceInfo));
+                       device->copyAceCheckAccessFunction(getInstance());
             bt_adapter_free_device_info(deviceInfo);
 
             LoggerD("invoke successCallback");
@@ -1541,6 +1551,7 @@ void BluetoothAdapter::returnRegisteredService(std::string &uuid, std::string &n
                         bt_socket_set_connection_state_changed_cb(onSocketConnected, this);
 
                         BluetoothServiceHandlerPtr serviceHandler = new BluetoothServiceHandler(uuid, name, socket);
+                                               serviceHandler->copyAceCheckAccessFunction(getInstance());
                         mRegisteredUUID.insert(std::pair<std::string, BluetoothServiceHandlerPtr>(uuid, serviceHandler));
                         
                         JSObjectRef serviceObj = JSBluetoothServiceHandler::createJSObject(userData->getContext(), serviceHandler);
@@ -1606,5 +1617,8 @@ void BluetoothAdapter::unsetChangeListener()
 }
 
 
+
+
+
 } // Bluetooth
 } // DeviceAPI