Merge pull request #408 from telerik/fatme/fail-if-invalid-timeout-is-specified

Fix iosDeviceDiscovery timeout option

Author: Fatme

mobile/ios/ios-device.ts

@@ -22,7 +22,6 @@ export class IOSDevice implements Mobile.IiOSDevice {
 	private static INCOMPATIBLE_IMAGE_SIGNATURE_ERROR_CODE = 3892314163;
 	private static INTERFACE_USB = 1;
 
-	private identifier: string = null;
 	private voidPtr = ref.refType(ref.types.void);
 	private mountImageCallbackPtr: NodeBuffer = null;
 
@@ -292,7 +291,7 @@ export class IOSDevice implements Mobile.IiOSDevice {
 
 					if (result !== 0 && result !== IOSDevice.IMAGE_ALREADY_MOUNTED_ERROR_CODE) { // 3892314230 - already mounted
 						if(result === IOSDevice.INCOMPATIBLE_IMAGE_SIGNATURE_ERROR_CODE) { // 3892314163
-							this.$logger.warn("Unable to mount image %s on device %s.", imagePath, this.identifier);
+							this.$logger.warn("Unable to mount image %s on device %s.", imagePath, this.deviceInfo.identifier);
 						} else {
 							this.$errors.fail("Unable to mount image on device.");
 						}

mobile/mobile-core/device-discovery.ts

@@ -63,7 +63,8 @@ class IOSDeviceDiscovery extends DeviceDiscovery {
 		private $mobileDevice: Mobile.IMobileDevice,
 		private $errors: IErrors,
 		private $injector: IInjector,
-		private $options: IOptions) {
+		private $options: IOptions,
+		private $utils: IUtils) {
 		super();
 		this.timerCallbackPtr = CoreTypes.CoreTypes.cf_run_loop_timer_callback.toPointer(IOSDeviceDiscovery.timerCallback);
 		this.notificationCallbackPtr = CoreTypes.CoreTypes.am_device_notification_callback.toPointer(IOSDeviceDiscovery.deviceNotificationCallback);
@@ -72,8 +73,10 @@ class IOSDeviceDiscovery extends DeviceDiscovery {
 	public startLookingForDevices(): IFuture<void> {
 		return (() => {
 			this.subscribeForNotifications();
-			let defaultTimeoutInSeconds = this.$options.timeout ? parseInt(this.$options.timeout, 10)/1000 : 1;
-			this.startRunLoopWithTimer(defaultTimeoutInSeconds);
+			let defaultTimeoutInSeconds = 1;
+			let parsedTimeout =  this.$utils.getParsedTimeout(1);
+			let timeout = parsedTimeout > defaultTimeoutInSeconds ? parsedTimeout/1000 : defaultTimeoutInSeconds;
+			this.startRunLoopWithTimer(timeout);
 		}).future<void>()();
 	}
 

utils.ts

@@ -12,7 +12,7 @@ export class Utils implements IUtils {
 			if(!isNaN(parsedValue) && parsedValue >= 0) {
 				timeout = parsedValue;
 			} else {
-				this.$logger.info("Specify timeout in a number of seconds to wait. Default value: " + timeout + " seconds will be used.");
+				this.$logger.warn("Specify timeout in a number of seconds to wait. Default value: " + timeout + " seconds will be used.");
 			}
 		}