Merge pull request #1976 from NativeScript/raikov/fix-livesync-on-device-simulator

Fixed: First time livesync syncs only on device even when simulator is running

Author: tzraikov

lib/services/livesync/android-platform-livesync-service.ts

@@ -50,10 +50,6 @@ class AndroidPlatformLiveSyncService extends PlatformLiveSyncServiceBase {
 			this.$devicesService.execute(action, canExecute).wait();
 		}).future<void>()();
 	}
-
-	protected getCanExecuteActionCore(platform: string, appIdentifier: string): (dev: Mobile.IDevice) => boolean {
-		return (device: Mobile.IDevice) => true;
-	}
 }
 
 $injector.register("androidPlatformLiveSyncServiceLocator", {factory: AndroidPlatformLiveSyncService});

lib/services/livesync/ios-platform-livesync-service.ts

@@ -46,26 +46,6 @@ class IOSPlatformLiveSyncService extends PlatformLiveSyncServiceBase {
 			this.$devicesService.execute(action, canExecute).wait();
 		}).future<void>()();
 	}
-
-	protected getCanExecuteActionCore(platform: string, appIdentifier: string): (dev: Mobile.IDevice) => boolean {
-		if (this.$options.emulator) {
-			return (device: Mobile.IDevice): boolean => this.$devicesService.isiOSSimulator(device);
-		} else {
-			let devices = this.$devicesService.getDevicesForPlatform(platform);
-			let simulator = _.find(devices, d => this.$devicesService.isiOSSimulator(d));
-			if (simulator) {
-				let iOSDevices = _.filter(devices, d => d.deviceInfo.identifier !== simulator.deviceInfo.identifier);
-				if (iOSDevices && iOSDevices.length) {
-					let isApplicationInstalledOnSimulator = simulator.applicationManager.isApplicationInstalled(appIdentifier).wait();
-					let isApplicationInstalledOnAllDevices = _.intersection.apply(null, iOSDevices.map(device => device.applicationManager.isApplicationInstalled(appIdentifier).wait()));
-					// In case the application is not installed on both device and simulator, syncs only on device.
-					if (!isApplicationInstalledOnSimulator && !isApplicationInstalledOnAllDevices) {
-						return (device: Mobile.IDevice): boolean => this.$devicesService.isiOSDevice(device);
-					}
-				}
-			}
-		}
-	}
 }
 
 $injector.register("iosPlatformLiveSyncServiceLocator", {factory: IOSPlatformLiveSyncService});

lib/services/livesync/platform-livesync-service-base.ts

@@ -31,8 +31,6 @@ export abstract class PlatformLiveSyncServiceBase implements IPlatformLiveSyncSe
 
 	public abstract fullSync(postAction?: (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => IFuture<void>): IFuture<void>;
 
-	protected abstract getCanExecuteActionCore(platform: string, appIdentifier: string): (dev: Mobile.IDevice) => boolean;
-
 	public partialSync(event: string, filePath: string, dispatcher: IFutureDispatcher, afterFileSyncAction: (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => IFuture<void>): void {
 		if (filePath.indexOf(constants.APP_RESOURCES_FOLDER_NAME) !== -1) {
 			this.$logger.warn(`Skipping livesync for changed file ${filePath}. This change requires a full build to update your application. `.yellow.bold);
@@ -72,12 +70,6 @@ export abstract class PlatformLiveSyncServiceBase implements IPlatformLiveSyncSe
 		if (this.$options.device) {
 			return (device: Mobile.IDevice): boolean => isTheSamePlatformAction(device) && device.deviceInfo.identifier === this.$devicesService.getDeviceByDeviceOption().deviceInfo.identifier;
 		}
-
-		let platformCanExecuteAction = this.getCanExecuteActionCore(platform, appIdentifier);
-		if (platformCanExecuteAction) {
-			return (device: Mobile.IDevice): boolean => isTheSamePlatformAction(device) && platformCanExecuteAction(device);
-		}
-
 		return isTheSamePlatformAction;
 	}