Fix references to Devices and remove unused properties

This commit is contained in:
Danny Tuppeny 2018-04-18 11:14:32 +01:00 committed by Danny Tuppeny
parent 53840fb0ce
commit 2bdb3bbe0e
4 changed files with 4 additions and 13 deletions

View File

@ -17,7 +17,7 @@ class AndroidEmulators extends EmulatorDiscovery {
bool get supportsPlatform => true;
@override
bool get canListAnything => androidWorkflow.canListDevices;
bool get canListAnything => androidWorkflow.canListEmulators;
@override
Future<List<Emulator>> get emulators async => getEmulatorAvds();
@ -44,9 +44,9 @@ List<AndroidEmulator> getEmulatorAvds() {
if (emulatorPath == null)
return <AndroidEmulator>[];
final String text = runSync(<String>[emulatorPath, '-list-avds']);
final List<AndroidEmulator> devices = <AndroidEmulator>[];
parseEmulatorAvdOutput(text, devices);
return devices;
final List<AndroidEmulator> emulators = <AndroidEmulator>[];
parseEmulatorAvdOutput(text, emulators);
return emulators;
}
/// Parse the given `emulator -list-avds` output in [text], and fill out the given list

View File

@ -45,9 +45,6 @@ class AndroidWorkflow extends DoctorValidator implements Workflow {
@override
bool get canListEmulators => getEmulatorPath(androidSdk) != null;
@override
bool get canLaunchEmulators => androidSdk != null && androidSdk.validateSdkWellFormed().isEmpty;
static const String _kJdkDownload = 'https://www.oracle.com/technetwork/java/javase/downloads/';
/// Returns false if we cannot determine the Java version or if the version

View File

@ -212,9 +212,6 @@ abstract class Workflow {
/// Are we functional enough to list emulators?
bool get canListEmulators;
/// Could this thing launch *something*? It may still have minor issues.
bool get canLaunchEmulators;
}
enum ValidationType {

View File

@ -33,9 +33,6 @@ class IOSWorkflow extends DoctorValidator implements Workflow {
@override
bool get canListEmulators => false;
@override
bool get canLaunchEmulators => false;
Future<bool> get hasIDeviceInstaller => exitsHappyAsync(<String>['ideviceinstaller', '-h']);
Future<bool> get hasIosDeploy => exitsHappyAsync(<String>['ios-deploy', '--version']);