Fixed: prepare is called twice when livesyncing

Author: Tsvetan Raikov

lib/commands/appstore-upload.ts

@@ -63,7 +63,7 @@ export class PublishIOS implements ICommand {
 					};
 					this.$logger.info("Building .ipa with the selected mobile provision and/or certificate.");
 					// This is not very correct as if we build multiple targets we will try to sign all of them using the signing identity here.
-					this.$platformService.buildPlatform(platform, iOSBuildConfig).wait();
+					this.$platformService.prepareAndExecute(platform, () => this.$platformService.buildPlatform(platform, iOSBuildConfig)).wait();
 					ipaFilePath = this.$platformService.lastOutputPath(platform, { isForDevice: iOSBuildConfig.buildForDevice });
 				} else {
 					this.$logger.info("No .ipa, mobile provision or certificate set. Perfect! Now we'll build .xcarchive and let Xcode pick the distribution certificate and provisioning profile for you when exporting .ipa for AppStore submission.");

lib/commands/build.ts

@@ -5,7 +5,7 @@ export class BuildCommandBase {
 	executeCore(args: string[], buildConfig?: IBuildConfig): IFuture<void> {
 		return (() => {
 			let platform = args[0].toLowerCase();
-			this.$platformService.buildPlatform(platform, buildConfig).wait();
+			this.$platformService.prepareAndExecute(platform, () => this.$platformService.buildPlatform(platform, buildConfig)).wait();
 			if(this.$options.copyTo) {
 				this.$platformService.copyLastOutput(platform, this.$options.copyTo, {isForDevice: this.$options.forDevice}).wait();
 			}

lib/definitions/platform.d.ts

@@ -21,6 +21,8 @@ interface IPlatformService {
 	copyLastOutput(platform: string, targetPath: string, settings: {isForDevice: boolean}): IFuture<void>;
 	lastOutputPath(platform: string, settings: { isForDevice: boolean }): string;
 	ensurePlatformInstalled(platform: string): IFuture<void>;
+
+	prepareAndExecute(platform: string, executeAction: () => IFuture<void>): IFuture<void>;
 }
 
 interface IPlatformData {

lib/services/android-debug-service.ts

@@ -108,7 +108,7 @@ class AndroidDebugService implements IDebugService {
 				let cachedDeviceOption = this.$options.forDevice;
 				this.$options.forDevice = true;
 				if (this.$options.rebuild) {
-					this.$platformService.buildPlatform(this.platform).wait();
+					this.$platformService.prepareAndExecute(this.platform, () => this.$platformService.buildPlatform(this.platform)).wait();
 				}
 				this.$options.forDevice = !!cachedDeviceOption;
 

lib/services/ios-debug-service.ts

@@ -88,7 +88,7 @@ class IOSDebugService implements IDebugService {
 		return (() => {
 			let platformData = this.$platformsData.getPlatformData(this.platform);
 			if (this.$options.rebuild) {
-				this.$platformService.buildPlatform(this.platform).wait();
+				this.$platformService.prepareAndExecute(this.platform, () => this.$platformService.buildPlatform(this.platform)).wait();
 			}
 			let emulatorPackage = this.$platformService.getLatestApplicationPackageForEmulator(platformData).wait();
 

lib/services/platform-service.ts

@@ -330,23 +330,25 @@ export class PlatformService implements IPlatformService {
 	public buildPlatform(platform: string, buildConfig?: IBuildConfig): IFuture<void> {
 		return (() => {
 			platform = platform.toLowerCase();
-			if (!this.preparePlatform(platform).wait()) {
-				this.$errors.failWithoutHelp("Verify that listed files are well-formed and try again the operation.");
-			}
-
 			let platformData = this.$platformsData.getPlatformData(platform);
 			platformData.platformProjectService.buildProject(platformData.projectRoot, buildConfig).wait();
 			this.$logger.out("Project successfully built.");
 		}).future<void>()();
 	}
 
+	public prepareAndExecute(platform: string, executeAction: () => IFuture<void>): IFuture<void> {
+ 		return (() => {
+ 			platform = platform.toLowerCase();
+ 			if (!this.preparePlatform(platform).wait()) {
+ 				this.$errors.failWithoutHelp("Verify that listed files are well-formed and try again the operation.");
+ 			}
+ 			executeAction().wait();
+ 		}).future<void>()();
+ 	}
+
 	public buildForDeploy(platform: string, buildConfig?: IBuildConfig): IFuture<void> {
 		return (() => {
 			platform = platform.toLowerCase();
-			if (!this.preparePlatform(platform).wait()) {
-				this.$errors.failWithoutHelp("Verify that listed files are well-formed and try again the operation.");
-			}
-
 			let platformData = this.$platformsData.getPlatformData(platform);
 			platformData.platformProjectService.buildForDeploy(platformData.projectRoot, buildConfig).wait();
 			this.$logger.out("Project successfully built");
@@ -440,12 +442,12 @@ export class PlatformService implements IPlatformService {
 				return (() => {
 					if (!packageFile) {
 						if (this.$devicesService.isiOSSimulator(device)) {
-							this.buildForDeploy(platform, buildConfig).wait();
+							this.prepareAndExecute(platform, () => this.buildForDeploy(platform, buildConfig)).wait();
 							packageFile = this.getLatestApplicationPackageForEmulator(platformData).wait().packageName;
 						} else {
 							buildConfig = buildConfig || {};
 							buildConfig.buildForDevice = true;
-							this.buildForDeploy(platform, buildConfig).wait();
+							this.prepareAndExecute(platform, () => this.buildForDeploy(platform, buildConfig)).wait();
 							packageFile = this.getLatestApplicationPackageForDevice(platformData).wait().packageName;
 						}
 					}
@@ -533,7 +535,7 @@ export class PlatformService implements IPlatformService {
 						emulatorServices.checkAvailability().wait();
 						emulatorServices.checkDependencies().wait();
 
-						this.buildPlatform(platform, buildConfig).wait();
+						this.prepareAndExecute(platform, () => this.buildPlatform(platform, buildConfig)).wait();
 
 						packageFile = this.getLatestApplicationPackageForEmulator(platformData).wait().packageName;
 						this.$logger.out("Using ", packageFile);