Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

requestDevice update

Browse source
This commit is contained in:
zakorgyula 2016-09-07 09:10:30 +02:00
parent 057b93f2e6
commit 359548f607
5 changed files with 136 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/net/bluetooth_thread.rs
View file

@ -114,7 +114,8 @@ fn matches_filter(device: &BluetoothDevice, filter: &BluetoothScanfilter) -> boo
}
}
}
return true;
true
}
fn matches_filters(device: &BluetoothDevice, filters: &BluetoothScanfilterSequence) -> bool {
@ -437,10 +438,14 @@ impl BluetoothManager {
}
let _ = session.stop_discovery();
}
let devices = self.get_and_cache_devices(&mut adapter);
let matched_devices: Vec<BluetoothDevice> = devices.into_iter()
.filter(|d| matches_filters(d, options.get_filters()))
.collect();
let mut matched_devices = self.get_and_cache_devices(&mut adapter);
if !options.is_accepting_all_devices() {
matched_devices = matched_devices.into_iter()
.filter(|d| matches_filters(d, options.get_filters()))
.collect();
}
if let Some(address) = self.select_device(matched_devices) {
let device_id = match self.address_to_id.get(&address) {
Some(id) => id.clone(),