Fix doctor command for android and adb

Fix doctor command, which checks adb and android incorrectly. Pass correct paths for verification.
Also make sure "No issues were detected" is printed when there are no issues.

Author: rosen-vladimirov

lib/android-tools-info.ts

@@ -149,7 +149,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 				}
 			}
 
-			return detectedErrors || isAndroidHomeValid;
+			return detectedErrors || !isAndroidHomeValid;
 		}).future<boolean>()();
 	}
 
@@ -177,6 +177,24 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 		}).future<boolean>()();
 	}
 
+	public getPathToAdbFromAndroidHome(): IFuture<string> {
+		return (() => {
+			if(this.androidHome) {
+				let pathToAdb = path.join(this.androidHome, "platform-tools", "adb") + (this.$hostInfo.isWindows ? ".exe" : "");
+				try {
+					this.$childProcess.execFile(pathToAdb, ["help"]).wait();
+					return pathToAdb;
+				} catch (err) {
+					// adb does not exist, so ANDROID_HOME is not set correctly
+					// try getting default adb path (included in CLI package)
+					this.$logger.trace(`Error while executing '${pathToAdb} help'. Error is: ${err.message}`);
+				}
+			}
+
+			return null;
+		}).future<string>()();
+	}
+
 	/**
 	 * Prints messages on the screen. In case the showWarningsAsErrors flag is set to true, warnings are shown, else - errors.
 	 * Uses logger.warn for warnings and errors.failWithoutHelp when erros must be shown.

lib/common

@@ -81,21 +81,8 @@ export class StaticConfig extends staticConfigBaseLibPath.StaticConfigBase imple
 	public getAdbFilePath(): IFuture<string> {
 		return (() => {
 			if(!this._adbFilePath) {
-				let androidHomeEnvVar = process.env.ANDROID_HOME;
-				if(androidHomeEnvVar) {
-					let pathToAdb = path.join(androidHomeEnvVar, "platform-tools", "adb");
-					let childProcess: IChildProcess = this.$injector.resolve("$childProcess");
-					try {
-						childProcess.execFile(pathToAdb, ["help"]).wait();
-						this._adbFilePath = pathToAdb;
-					} catch (err) {
-						// adb does not exist, so ANDROID_HOME is not set correctly
-						// try getting default adb path (included in CLI package)
-						super.getAdbFilePath().wait();
-					}
-				} else {
-					super.getAdbFilePath().wait();
-				}
+				let androidToolsInfo: IAndroidToolsInfo = this.$injector.resolve("androidToolsInfo");
+				this._adbFilePath = androidToolsInfo.getPathToAdbFromAndroidHome().wait() || super.getAdbFilePath().wait();
 			}
 
 			return this._adbFilePath;

lib/config.ts

@@ -127,9 +127,15 @@ interface IAndroidToolsInfo {
 	/**
 	 * Returns the path to `android` executable. It should be `$ANDROID_HOME/tools/android`.
 	 * In case ANDROID_HOME is not defined, check if `android` is part of $PATH.
-	 * @return {boolean} Path to the `android` executable.
+	 * @return {string} Path to the `android` executable.
 	 */
 	getPathToAndroidExecutable(): IFuture<string>;
+
+	/**
+	 * Gets the path to `adb` executable from ANDROID_HOME. It should be `$ANDROID_HOME/platform-tools/adb` in case it exists.
+	 * @return {string} Path to the `adb` executable. In case it does not exists, null is returned.
+	 */
+	getPathToAdbFromAndroidHome(): IFuture<string>;
 }
 
 /**

lib/declarations.ts

@@ -13,7 +13,11 @@ class DoctorService implements IDoctorService {
 
 	public printWarnings(): boolean {
 		let result = false;
-		let sysInfo = this.$sysInfo.getSysInfo();
+		let androidToolsInfo = {
+			pathToAdb: this.$androidToolsInfo.getPathToAdbFromAndroidHome().wait(),
+			pathToAndroid: this.$androidToolsInfo.getPathToAndroidExecutable().wait()
+		};
+		let sysInfo = this.$sysInfo.getSysInfo(androidToolsInfo);
 
 		if (!sysInfo.adbVer) {
 			this.$logger.warn("WARNING: adb from the Android SDK is not installed or is not configured properly.");
@@ -59,9 +63,8 @@ class DoctorService implements IDoctorService {
 				result = true;
 			}
 		} else {
-			this.$logger.warn("WARNING: You can work with iOS only on Mac OS X systems.");
+			this.$logger.out("NOTE: You can develop for iOS only on Mac OS X systems.");
 			this.$logger.out("To be able to work with iOS devices and projects, you need Mac OS X Mavericks or later." + EOL);
-			result = true;
 		}
 
 		if(!sysInfo.javaVer) {