firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix getDevicesById() (#9646)

Browse Source 
If the user specified a non-exact device id, it was producing
an exception whereby we were trying to listen to the
`getAllConnectedDevies()` stream twice.
This commit is contained in:
Todd Volkert
2017-04-27 13:12:59 -07:00
committed by GitHub
parent 744c91265b
commit ffdca6f7e8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/flutter_tools/lib/src/device.dart
View File

@@ -53,7 +53,7 @@ class DeviceManager {
bool get hasSpecifiedAllDevices => _specifiedDeviceId == 'all';
Stream<Device> getDevicesById(String deviceId) async* {
final Stream<Device> devices = getAllConnectedDevices();
final List<Device> devices = await getAllConnectedDevices().toList();
deviceId = deviceId.toLowerCase();
bool exactlyMatchesDeviceId(Device device) =>
device.id.toLowerCase() == deviceId ||
@@ -62,15 +62,15 @@ class DeviceManager {
device.id.toLowerCase().startsWith(deviceId) ||
device.name.toLowerCase().startsWith(deviceId);
final Device exactMatch = await devices.firstWhere(
exactlyMatchesDeviceId, defaultValue: () => null);
final Device exactMatch = devices.firstWhere(
exactlyMatchesDeviceId, orElse: () => null);
if (exactMatch != null) {
yield exactMatch;
return;
}
// Match on a id or name starting with [deviceId].
await for (Device device in devices.where(startsWithDeviceId))
for (Device device in devices.where(startsWithDeviceId))
yield device;
}