Fix comments about extracting default device looking options.

Author: KristianDD

mobile/mobile-core/devices-service.ts

@@ -174,7 +174,8 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 
 					for (const deviceDiscovery of this._allDeviceDiscoveries) {
 						try {
-							await deviceDiscovery.startLookingForDevices({ shouldReturnImmediateResult: false, platform: this._platform });
+							const deviceLookingOptions = this.getDeviceLookingOptions();
+							await deviceDiscovery.startLookingForDevices(deviceLookingOptions);
 						} catch (err) {
 							this.$logger.trace("Error while checking for new devices.", err);
 						}
@@ -220,7 +221,7 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 	private async startLookingForDevices(options?: Mobile.IDeviceLookingOptions): Promise<void> {
 		this.$logger.trace("startLookingForDevices; platform is %s", this._platform);
 		if (!options) {
-			options = {shouldReturnImmediateResult: false, platform: this._platform};
+			options = this.getDeviceLookingOptions();
 		}
 		if (!this._platform) {
 			await this.detectCurrentlyAttachedDevices(options);
@@ -259,7 +260,8 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 	 * @param identifier parameter passed by the user to --device flag
 	 */
 	public async getDevice(deviceOption: string): Promise<Mobile.IDevice> {
-		await this.detectCurrentlyAttachedDevices({ shouldReturnImmediateResult: false, platform: this._platform });
+		const deviceLookingOptions = this.getDeviceLookingOptions();
+		await this.detectCurrentlyAttachedDevices(deviceLookingOptions);
 		let device: Mobile.IDevice = null;
 
 		let emulatorIdentifier = null;
@@ -462,7 +464,8 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 				if (data.skipDeviceDetectionInterval) {
 					await this.detectCurrentlyAttachedDevices();
 				} else {
-					await this.startLookingForDevices({ shouldReturnImmediateResult: true, platform: this._platform });
+					const deviceLookingOptions = this.getDeviceLookingOptions(this._platform, true);
+					await this.startLookingForDevices(deviceLookingOptions);
 				}
 			} else {
 				await this.detectCurrentlyAttachedDevices();
@@ -600,7 +603,7 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 	public async startEmulator(platform?: string, emulatorImage?: string): Promise<void> {
 
 		platform = platform || this._platform;
-
+		const deviceLookingOptions = this.getDeviceLookingOptions(platform);
 		let emulatorServices = this.resolveEmulatorServices(platform);
 		if (!emulatorServices) {
 			this.$errors.failWithoutHelp("Unable to detect platform for which to start emulator.");
@@ -609,9 +612,9 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 		await emulatorServices.startEmulator(emulatorImage);
 
 		if (this.$mobileHelper.isAndroidPlatform(platform)) {
-			await this.$androidDeviceDiscovery.startLookingForDevices({ shouldReturnImmediateResult: false, platform: platform });
+			await this.$androidDeviceDiscovery.startLookingForDevices(deviceLookingOptions);
 		} else if (this.$mobileHelper.isiOSPlatform(platform) && this.$hostInfo.isDarwin) {
-			await this.$iOSSimulatorDiscovery.startLookingForDevices({ shouldReturnImmediateResult: false, platform: platform });
+			await this.$iOSSimulatorDiscovery.startLookingForDevices(deviceLookingOptions);
 		}
 	}
 
@@ -663,6 +666,12 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 			isLiveSyncSupported
 		};
 	}
+
+	private getDeviceLookingOptions(platform?: string, shouldReturnImmediateResult?: boolean): Mobile.IDeviceLookingOptions {
+		platform = platform || this._platform;
+		shouldReturnImmediateResult = shouldReturnImmediateResult || false;
+		return { shouldReturnImmediateResult: shouldReturnImmediateResult, platform: platform };
+	}
 }
 
 $injector.register("devicesService", DevicesService);