Merge branch 'master' into issue-3020

Author: PanayotCankov

lib/services/ios-project-service.ts

@@ -330,6 +330,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 				handler,
 				this.buildForSimulator(projectRoot, basicArgs, projectData, buildConfig.buildOutputStdio));
 		}
+
+		this.validateApplicationIdentifier(projectData);
 	}
 
 	public async validatePlugins(projectData: IProjectData): Promise<void> {
@@ -1339,6 +1341,23 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 			"Distribution": "app-store",
 			"Enterprise": "enterprise"
 		}[provision.Type];
+  }
+
+	private validateApplicationIdentifier(projectData: IProjectData): void {
+		const projectDir = projectData.projectDir;
+		const infoPlistPath = path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.getPlatformData(projectData).normalizedPlatformName, this.getPlatformData(projectData).configurationFileName);
+		const mergedPlistPath =  this.getPlatformData(projectData).configurationFilePath;
+
+		if (!this.$fs.exists(infoPlistPath) || !this.$fs.exists(mergedPlistPath)) {
+			return;
+		}
+
+		const infoPlist = plist.parse(this.$fs.readText(infoPlistPath));
+		const mergedPlist = plist.parse(this.$fs.readText(mergedPlistPath));
+
+		if (infoPlist.CFBundleIdentifier && infoPlist.CFBundleIdentifier !== mergedPlist.CFBundleIdentifier) {
+			this.$logger.warnWithLabel("The CFBundleIdentifier key inside the 'Info.plist' will be overriden by the 'id' inside 'package.json'.");
+		}
 	}
 }
 

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

@@ -36,14 +36,25 @@ export class AndroidDeviceLiveSyncService extends DeviceLiveSyncServiceBase impl
 				`${deviceProjectRootDirname}/sync`]
 		);
 
+		await this.reloadResources(deviceAppData, localToDevicePaths);
+
 		const canExecuteFastSync = !liveSyncInfo.isFullSync && !_.some(localToDevicePaths,
 			(localToDevicePath: Mobile.ILocalToDevicePathData) => !this.canExecuteFastSync(localToDevicePath.getLocalPath(), projectData, this.device.deviceInfo.platform));
 
-		if (canExecuteFastSync) {
-			return this.reloadPage(deviceAppData, localToDevicePaths);
+		if (!canExecuteFastSync) {
+			return this.restartApplication(deviceAppData);
 		}
+	}
+
+	private async cleanLivesyncDirectories(deviceAppData: Mobile.IDeviceAppData): Promise<void> {
+		const deviceRootPath = await this.$devicePathProvider.getDeviceProjectRootPath(deviceAppData.device, {
+			appIdentifier: deviceAppData.appIdentifier,
+			getDirname: true
+		});
 
-		return this.restartApplication(deviceAppData);
+		await this.device.adb.executeShellCommand(["rm", "-rf", await this.$mobileHelper.buildDevicePath(deviceRootPath, LiveSyncPaths.FULLSYNC_DIR_NAME),
+			this.$mobileHelper.buildDevicePath(deviceRootPath, LiveSyncPaths.SYNC_DIR_NAME),
+			await this.$mobileHelper.buildDevicePath(deviceRootPath, LiveSyncPaths.REMOVEDSYNC_DIR_NAME)]);
 	}
 
 	private async restartApplication(deviceAppData: Mobile.IDeviceAppData): Promise<void> {
@@ -70,15 +81,16 @@ export class AndroidDeviceLiveSyncService extends DeviceLiveSyncServiceBase impl
 			await this.device.adb.executeShellCommand(["rm", "-f", deviceRootPath]);
 		}
 
-		this.device.adb.executeShellCommand(["rm", "-rf", this.$mobileHelper.buildDevicePath(deviceRootPath, LiveSyncPaths.FULLSYNC_DIR_NAME),
-			this.$mobileHelper.buildDevicePath(deviceRootPath, LiveSyncPaths.SYNC_DIR_NAME),
-			await this.$mobileHelper.buildDevicePath(deviceRootPath, LiveSyncPaths.REMOVEDSYNC_DIR_NAME)]);
+		await this.cleanLivesyncDirectories(deviceAppData);
 	}
 
-	private async reloadPage(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]): Promise<void> {
+	private async reloadResources(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]): Promise<void> {
 		await this.device.adb.executeCommand(["forward", `tcp:${AndroidDeviceLiveSyncService.BACKEND_PORT.toString()}`, `localabstract:${deviceAppData.appIdentifier}-livesync`]);
-		if (!await this.sendPageReloadMessage()) {
-			await this.restartApplication(deviceAppData);
+
+		if (await this.sendPageReloadMessage()) {
+			await this.cleanLivesyncDirectories(deviceAppData);
+		} else {
+			await this.restartApplication(deviceAppData); //in case runtime socket error/close
 		}
 	}
 

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

@@ -91,7 +91,7 @@ export abstract class PlatformLiveSyncServiceBase {
 			modifiedLocalToDevicePaths.push(...localToDevicePaths);
 
 			const deviceLiveSyncService = this.getDeviceLiveSyncService(device, projectData.projectId);
-			deviceLiveSyncService.removeFiles(deviceAppData, localToDevicePaths);
+			await deviceLiveSyncService.removeFiles(deviceAppData, localToDevicePaths);
 		}
 
 		return {