Commit 2bdb3bbe authored by Danny Tuppeny's avatar Danny Tuppeny Committed by Danny Tuppeny

Fix references to Devices and remove unused properties

parent 53840fb0
...@@ -17,7 +17,7 @@ class AndroidEmulators extends EmulatorDiscovery { ...@@ -17,7 +17,7 @@ class AndroidEmulators extends EmulatorDiscovery {
bool get supportsPlatform => true; bool get supportsPlatform => true;
@override @override
bool get canListAnything => androidWorkflow.canListDevices; bool get canListAnything => androidWorkflow.canListEmulators;
@override @override
Future<List<Emulator>> get emulators async => getEmulatorAvds(); Future<List<Emulator>> get emulators async => getEmulatorAvds();
...@@ -44,9 +44,9 @@ List<AndroidEmulator> getEmulatorAvds() { ...@@ -44,9 +44,9 @@ List<AndroidEmulator> getEmulatorAvds() {
if (emulatorPath == null) if (emulatorPath == null)
return <AndroidEmulator>[]; return <AndroidEmulator>[];
final String text = runSync(<String>[emulatorPath, '-list-avds']); final String text = runSync(<String>[emulatorPath, '-list-avds']);
final List<AndroidEmulator> devices = <AndroidEmulator>[]; final List<AndroidEmulator> emulators = <AndroidEmulator>[];
parseEmulatorAvdOutput(text, devices); parseEmulatorAvdOutput(text, emulators);
return devices; return emulators;
} }
/// Parse the given `emulator -list-avds` output in [text], and fill out the given list /// Parse the given `emulator -list-avds` output in [text], and fill out the given list
......
...@@ -45,9 +45,6 @@ class AndroidWorkflow extends DoctorValidator implements Workflow { ...@@ -45,9 +45,6 @@ class AndroidWorkflow extends DoctorValidator implements Workflow {
@override @override
bool get canListEmulators => getEmulatorPath(androidSdk) != null; 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/'; 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 /// Returns false if we cannot determine the Java version or if the version
......
...@@ -212,9 +212,6 @@ abstract class Workflow { ...@@ -212,9 +212,6 @@ abstract class Workflow {
/// Are we functional enough to list emulators? /// Are we functional enough to list emulators?
bool get canListEmulators; bool get canListEmulators;
/// Could this thing launch *something*? It may still have minor issues.
bool get canLaunchEmulators;
} }
enum ValidationType { enum ValidationType {
......
...@@ -33,9 +33,6 @@ class IOSWorkflow extends DoctorValidator implements Workflow { ...@@ -33,9 +33,6 @@ class IOSWorkflow extends DoctorValidator implements Workflow {
@override @override
bool get canListEmulators => false; bool get canListEmulators => false;
@override
bool get canLaunchEmulators => false;
Future<bool> get hasIDeviceInstaller => exitsHappyAsync(<String>['ideviceinstaller', '-h']); Future<bool> get hasIDeviceInstaller => exitsHappyAsync(<String>['ideviceinstaller', '-h']);
Future<bool> get hasIosDeploy => exitsHappyAsync(<String>['ios-deploy', '--version']); Future<bool> get hasIosDeploy => exitsHappyAsync(<String>['ios-deploy', '--version']);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment