Skip to content

Commit 7eba27a

Browse files
Fix check isAndroidHomeValid
The method that validates ANDROID_HOME returns array with errors, so current `if(isAndroidHomeValid)` checks are always true. Create new method that returns boolean value and use it instead.
1 parent b3b56d0 commit 7eba27a

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

lib/android-tools-info.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
3939
public validateInfo(): NativeScriptDoctor.IWarning[] {
4040
const errors: NativeScriptDoctor.IWarning[] = [];
4141
const toolsInfoData = this.getToolsInfo();
42-
const isAndroidHomeValid = this.validateAndroidHomeEnvVariable();
42+
const isAndroidHomeValid = this.isAndroidHomeValid();
4343
if (!toolsInfoData.compileSdkVersion) {
4444
errors.push({
4545
warning: `Cannot find a compatible Android SDK for compilation. To be able to build for Android, install Android SDK ${AndroidToolsInfo.MIN_REQUIRED_COMPILE_TARGET} or later.`,
@@ -176,7 +176,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
176176
const sdkmanagerName = "sdkmanager";
177177
let sdkManagementToolPath = sdkmanagerName;
178178

179-
const isAndroidHomeValid = this.validateAndroidHomeEnvVariable();
179+
const isAndroidHomeValid = this.isAndroidHomeValid();
180180

181181
if (isAndroidHomeValid) {
182182
// In case ANDROID_HOME is correct, check if sdkmanager exists and if not it means the SDK has not been updated.
@@ -316,4 +316,9 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
316316

317317
return linkToSystemRequirements;
318318
}
319+
320+
private isAndroidHomeValid(): boolean {
321+
const errors = this.validateAndroidHomeEnvVariable();
322+
return !errors && !errors.length;
323+
}
319324
}

0 commit comments

Comments
 (0)