Merge pull request #391 from telerik/fatme/fix-ios-livesync

Fix livesync ios when having both iOS and Android devices connected at the same time

Author: Fatme

commands/device/stop-application.ts

@@ -13,11 +13,11 @@ export class StopApplicationOnDeviceCommand implements ICommand {
 		private $staticConfig: Config.IStaticConfig,
 		private $options: IOptions) { }
 
-	allowedParameters: ICommandParameter[] = [this.$stringParameter];
+	allowedParameters: ICommandParameter[] = [this.$stringParameter, this.$stringParameter];
 
 	public execute(args: string[]): IFuture<void> {
 		return (() => {
-			this.$devicesServices.initialize({ deviceId: this.$options.device, skipInferPlatform: true }).wait();
+			this.$devicesServices.initialize({ deviceId: this.$options.device, skipInferPlatform: true, platform: args[1] }).wait();
 
 			if (this.$devicesServices.deviceCount > 1) {
 				this.$errors.failWithoutHelp("More than one device found. Specify device explicitly with --device option.To discover device ID, use $%s device command.", this.$staticConfig.CLIENT_NAME.toLowerCase());

mobile/ios/ios-application-manager.ts

@@ -21,7 +21,8 @@ export class IOSApplicationManager implements Mobile.IDeviceApplicationManager {
 		private $mobileDevice: Mobile.IMobileDevice,
 		private $logger: ILogger,
 		private $hostInfo: IHostInfo,
-		private $staticConfig: IStaticConfig) {
+		private $staticConfig: IStaticConfig,
+		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants) {
 			this.uninstallApplicationCallbackPtr = CoreTypes.am_device_mount_image_callback.toPointer(IOSApplicationManager.uninstallCallback); 
 		}
 
@@ -80,7 +81,7 @@ export class IOSApplicationManager implements Mobile.IDeviceApplicationManager {
 	public restartApplication(applicationId: string): IFuture<void> {
 		return (() => {
 			// This must be executed in separate process because ddb sometimes fails and the cli crashes.
-			this.$childProcess.exec(`${process.argv[0]} ${process.argv[1]} device stop ${applicationId}`).wait();
+			this.$childProcess.exec(`${process.argv[0]} ${process.argv[1]} device stop ${applicationId} ${this.$devicePlatformsConstants.iOS}`).wait();
 			this.runApplicationCore(applicationId).wait();
 		}).future<void>()();
 	}