Refactors.

src/commands/android/subcommands/list/avd.ts

@@ -22,14 +22,17 @@ export async function listInstalledAVDs(sdkRoot: string, platform: Platform): Pr
       return false;
     }
 
-    Logger.log(installedAVDs);
+    if (installedAVDs.split('\n').length < 3) {
+      Logger.log(colors.red('No installed AVDs found!'));
+    } else {
+      Logger.log(installedAVDs);
+    }
 
     return true;
   } catch (err) {
-    Logger.log(colors.red('Error occured while listing installed AVDs.'));
+    Logger.log(colors.red('Error occurred while listing installed AVDs.'));
     console.error(err);
 
     return false;
   }
 }
-

src/commands/android/subcommands/list/device.ts

@@ -28,4 +28,3 @@ export async function listConnectedDevices(sdkRoot: string, platform: Platform):
 
   return true;
 }
-

src/commands/android/subcommands/list/index.ts

@@ -2,44 +2,43 @@ import inquirer from 'inquirer';
 
 import Logger from '../../../../logger';
 import {Options, Platform} from '../../interfaces';
+import {verifyOptions} from '../common';
 import {listInstalledAVDs} from './avd';
 import {listConnectedDevices} from './device';
-import {verifyOptions} from '../common';
 
 export async function list(options: Options, sdkRoot: string, platform: Platform): Promise<boolean> {
   const optionsVerified = verifyOptions('list', options);
   if (!optionsVerified) {
     return false;
   }
 
-  const subcommandFlag = optionsVerified.subcommandFlag;
+  let subcommandFlag = optionsVerified.subcommandFlag;
   if (subcommandFlag === '') {
-    await flagsPrompt(options);
+    subcommandFlag = await promptForFlag();
   }
 
-  if (options.avd) {
+  if (subcommandFlag === 'avd') {
     return await listInstalledAVDs(sdkRoot, platform);
-  } else if (options.device) {
+  } else if (subcommandFlag === 'device') {
     return await listConnectedDevices(sdkRoot, platform);
   }
 
   return false;
 }
 
-async function flagsPrompt(options: Options) {
+async function promptForFlag(): Promise<string> {
   const flagAnswer = await inquirer.prompt({
     type: 'list',
     name: 'flag',
     message: 'Select what do you want to list:',
     choices: ['Connected devices', 'Installed AVDs']
   });
+  Logger.log();
 
   const flag = flagAnswer.flag;
   if (flag === 'Connected devices') {
-    options.device = true;
-  } else if (flag === 'Installed AVDs') {
-    options.avd = true;
+    return 'device';
   }
-  Logger.log();
-}
 
+  return 'avd';
+}