Merge pull request #15 from NativeScript/vladimirov/fix-check-android-local

Fix check for android local builds

Author: rosen-vladimirov

lib/index.ts

@@ -19,7 +19,7 @@ const androidToolsInfo = new AndroidToolsInfo(childProcess, fileSystem, hostInfo
 
 const sysInfo: NativeScriptDoctor.ISysInfo = new SysInfo(childProcess, fileSystem, helpers, hostInfo, winReg, androidToolsInfo);
 
-const androidLocalBuildRequirements = new AndroidLocalBuildRequirements(sysInfo);
+const androidLocalBuildRequirements = new AndroidLocalBuildRequirements(androidToolsInfo, sysInfo);
 const iOSLocalBuildRequirements = new IosLocalBuildRequirements(sysInfo, hostInfo);
 
 const doctor: NativeScriptDoctor.IDoctor = new Doctor(androidLocalBuildRequirements, helpers, hostInfo, iOSLocalBuildRequirements, sysInfo, androidToolsInfo);

lib/local-build-requirements/android-local-build-requirements.ts

@@ -1,8 +1,11 @@
 export class AndroidLocalBuildRequirements {
-	constructor(private sysInfo: NativeScriptDoctor.ISysInfo) { }
+	constructor(private androidToolsInfo: NativeScriptDoctor.IAndroidToolsInfo,
+		private sysInfo: NativeScriptDoctor.ISysInfo) { }
 
 	public async checkRequirements(): Promise<boolean> {
-		if (!await this.sysInfo.getJavaCompilerVersion() ||
+		const androidToolsInfo = await this.androidToolsInfo.validateInfo();
+		if (androidToolsInfo.length ||
+			!await this.sysInfo.getJavaCompilerVersion() ||
 			!await this.sysInfo.getJavaVersion() ||
 			!await this.sysInfo.getAdbVersion()) {
 			return false;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-doctor",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Library that helps identifying if the environment can be used for development of {N} apps.",
   "main": "lib/index.js",
   "types": "./typings/nativescript-doctor.d.ts",