From: Sudha Bheemanna Date: Mon, 6 Feb 2017 07:26:05 +0000 (+0530) Subject: [BT C#] Fix BLE scan callback to indicate correct result type X-Git-Tag: submit/trunk/20170823.075128~118^2~16^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c91df277b123592e98f444eccbc57684d5995b3a;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [BT C#] Fix BLE scan callback to indicate correct result type Updated the result to BluetoothError type to indicate correct result in the callback Change-Id: I9a59c361fd6838316e2fbbd47eed7a28fda3f2a4 Signed-off-by: Sudha Bheemanna --- diff --git a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothEventArgs.cs b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothEventArgs.cs old mode 100644 new mode 100755 index 8c136d6..6ecbc47 --- a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothEventArgs.cs +++ b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothEventArgs.cs @@ -821,9 +821,9 @@ namespace Tizen.Network.Bluetooth public class AdapterLeScanResultChangedEventArgs : EventArgs { private BluetoothLeDevice _deviceData; - private int _result; + private BluetoothError _result; - internal AdapterLeScanResultChangedEventArgs(int result, BluetoothLeDevice deviceData) + internal AdapterLeScanResultChangedEventArgs(BluetoothError result, BluetoothLeDevice deviceData) { _deviceData = deviceData; _result = result; @@ -832,7 +832,7 @@ namespace Tizen.Network.Bluetooth /// /// The result. /// - public int Result + public BluetoothError Result { get { diff --git a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothLeAdapterImpl.cs b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothLeAdapterImpl.cs index e1cf43a..a6773af 100755 --- a/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothLeAdapterImpl.cs +++ b/src/Tizen.Network.Bluetooth/Tizen.Network.Bluetooth/BluetoothLeAdapterImpl.cs @@ -168,8 +168,9 @@ namespace Tizen.Network.Bluetooth BluetoothLeScanData scanDataInfo = BluetoothUtils.ConvertStructToLeScanData(scanData); BluetoothLeDevice device = new BluetoothLeDevice(scanDataInfo); + BluetoothError res = (BluetoothError)result; - AdapterLeScanResultChangedEventArgs e = new AdapterLeScanResultChangedEventArgs (result, + AdapterLeScanResultChangedEventArgs e = new AdapterLeScanResultChangedEventArgs (res, device); _adapterLeScanResultChanged (null, e); }; @@ -425,7 +426,7 @@ namespace Tizen.Network.Bluetooth { Log.Info(Globals.LogTag, "Setting advertising state changed callback !! " ); // TODO: check if this conversion is required - //BluetoothLeAdvertiser leAdvertiser = (BluetoothLeAdvertiser)Marshal.PtrToStructure(advertiserHandle, typeof(BluetoothLeAdvertiser)); + BluetoothLeAdvertiser leAdvertiser = (BluetoothLeAdvertiser)Marshal.PtrToStructure(advertiserHandle, typeof(BluetoothLeAdvertiser)); AdvertisingStateChangedEventArgs e = new AdvertisingStateChangedEventArgs(result, advertiserHandle, state); _advertisingStateChanged(null, e); };