Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reorder startNotifications steps

Browse source
This commit is contained in:
Zakor Gyula 2017-02-09 17:32:01 +01:00 • committed by Attila Dusnoki
parent 384391da68
commit fae2beeda0
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/bluetooth/lib.rs
View file

@ -886,7 +886,7 @@ impl BluetoothManager {
// https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-startnotifications // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-startnotifications
// https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-stopnotifications // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-stopnotifications
fn enable_notification(&mut self, id: String, enable: bool) -> BluetoothResponseResult { fn enable_notification(&mut self, id: String, enable: bool) -> BluetoothResponseResult {
// (StartNotifications) Step 2 - 3. // (StartNotifications) Step 3 - 4.
// (StopNotifications) Step 1 - 2. // (StopNotifications) Step 1 - 2.
if !self.characteristic_is_cached(&id) { if !self.characteristic_is_cached(&id) {
return Err(BluetoothError::InvalidState); return Err(BluetoothError::InvalidState);
@ -909,11 +909,11 @@ impl BluetoothManager {
// (StopNotification) Step 5. // (StopNotification) Step 5.
Ok(_) => return Ok(BluetoothResponse::EnableNotification(())), Ok(_) => return Ok(BluetoothResponse::EnableNotification(())),
// (StartNotification) Step 4. // (StartNotification) Step 5.
Err(_) => return Err(BluetoothError::NotSupported), Err(_) => return Err(BluetoothError::NotSupported),
} }
}, },
// (StartNotification) Step 3. // (StartNotification) Step 4.
None => return Err(BluetoothError::InvalidState), None => return Err(BluetoothError::InvalidState),
} }
} }

18
components/script/dom/bluetoothremotegattcharacteristic.rs
View file

@ -209,22 +209,22 @@ impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteris
return p; return p;
} }
// Step 4. // Step 2.
if !self.Service().Device().Gatt().Connected() {
p.reject_error(p_cx, Network);
return p;
}
// Step 5.
if !(self.Properties().Notify() || if !(self.Properties().Notify() ||
self.Properties().Indicate()) { self.Properties().Indicate()) {
p.reject_error(p_cx, NotSupported); p.reject_error(p_cx, NotSupported);
return p; return p;
} }
// TODO: Step 5: Implement `active notification context set` for BluetoothRemoteGATTCharacteristic. // TODO: Step 6: Implement `active notification context set` for BluetoothRemoteGATTCharacteristic.
// Step 6. // Note: Steps 3 - 4, 7 - 11 are implemented in components/bluetooth/lib.rs in enable_notification function
if !self.Service().Device().Gatt().Connected() {
p.reject_error(p_cx, Network);
return p;
}
// Note: Steps 2 - 3, 7 - 11 are implemented in components/bluetooth/lib.rs in enable_notification function
// and in handle_response function. // and in handle_response function.
let sender = response_async(&p, self); let sender = response_async(&p, self);
self.get_bluetooth_thread().send( self.get_bluetooth_thread().send(