Fixed: getfile/putfile operate with global files (not local ones) (#2434)

Author: tzraikov

lib/common

@@ -43,7 +43,7 @@ export abstract class PlatformLiveSyncServiceBase implements IPlatformLiveSyncSe
 					if (this.shouldTransferAllFiles(platform, deviceAppData)) {
 						localToDevicePaths = this.$projectFilesManager.createLocalToDevicePaths(deviceAppData, projectFilesPath, null, this.liveSyncData.excludedProjectDirsAndFiles);
 						this.transferFiles(deviceAppData, localToDevicePaths, this.liveSyncData.projectFilesPath, true).wait();
-						device.fileSystem.putFile(this.$projectChangesService.getPrepareInfoFilePath(platform), this.getLiveSyncInfoFilePath(deviceAppData)).wait();
+						device.fileSystem.putFile(this.$projectChangesService.getPrepareInfoFilePath(platform), this.getLiveSyncInfoFilePath(deviceAppData), appIdentifier).wait();
 					}
 
 					if (postAction) {
@@ -194,7 +194,7 @@ export abstract class PlatformLiveSyncServiceBase implements IPlatformLiveSyncSe
 				if (!afterFileSyncAction) {
 					this.refreshApplication(deviceAppData, localToDevicePaths, isFullSync).wait();
 				}
-				device.fileSystem.putFile(this.$projectChangesService.getPrepareInfoFilePath(device.deviceInfo.platform), this.getLiveSyncInfoFilePath(deviceAppData)).wait();
+				device.fileSystem.putFile(this.$projectChangesService.getPrepareInfoFilePath(device.deviceInfo.platform), this.getLiveSyncInfoFilePath(deviceAppData), this.liveSyncData.appIdentifier).wait();
 				this.finishLivesync(deviceAppData).wait();
 				if (afterFileSyncAction) {
 					afterFileSyncAction(deviceAppData, localToDevicePaths).wait();
@@ -219,10 +219,7 @@ export abstract class PlatformLiveSyncServiceBase implements IPlatformLiveSyncSe
 	}
 
 	private getLiveSyncInfoFilePath(deviceAppData: Mobile.IDeviceAppData) {
-		let deviceRootPath = deviceAppData.deviceProjectRootPath;
-		if (deviceAppData.device.deviceInfo.platform.toLowerCase() === this.$devicePlatformsConstants.Android.toLowerCase()) {
-			deviceRootPath = path.dirname(deviceRootPath);
-		}
+		let deviceRootPath = path.dirname(deviceAppData.deviceProjectRootPath);
 		let deviceFilePath = path.join(deviceRootPath, livesyncInfoFileName);
 		return deviceFilePath;
 	}

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

@@ -405,7 +405,8 @@ export class PlatformService implements IPlatformService {
 			if (!this.$options.release) {
 				let deviceFilePath = this.getDeviceBuildInfoFilePath(device);
 				let buildInfoFilePath = this.getBuildOutputPath(device.deviceInfo.platform, platformData, { buildForDevice: !device.isEmulator });
-				device.fileSystem.putFile(path.join(buildInfoFilePath, buildInfoFileName), deviceFilePath).wait();
+				let appIdentifier = this.$projectData.projectId;
+				device.fileSystem.putFile(path.join(buildInfoFilePath, buildInfoFileName), deviceFilePath, appIdentifier).wait();
 			}
 			this.$logger.out(`Successfully installed on device with identifier '${device.deviceInfo.identifier}'.`);
 		}).future<void>()();
@@ -494,10 +495,7 @@ export class PlatformService implements IPlatformService {
 
 	private getDeviceBuildInfoFilePath(device: Mobile.IDevice): string {
 		let deviceAppData = this.$deviceAppDataFactory.create(this.$projectData.projectId, device.deviceInfo.platform, device);
-		let deviceRootPath = deviceAppData.deviceProjectRootPath;
-		if (device.deviceInfo.platform.toLowerCase() === this.$devicePlatformsConstants.Android.toLowerCase()) {
-			deviceRootPath = path.dirname(deviceRootPath);
-		}
+		let deviceRootPath = path.dirname(deviceAppData.deviceProjectRootPath);
 		return path.join(deviceRootPath, buildInfoFileName);
 	}
 
@@ -770,7 +768,7 @@ export class PlatformService implements IPlatformService {
 			temp.track();
 			let uniqueFilePath = temp.path({ suffix: ".tmp" });
 			try {
-				device.fileSystem.getFile(deviceFilePath, uniqueFilePath).wait();
+				device.fileSystem.getFile(deviceFilePath, this.$projectData.projectId, uniqueFilePath).wait();
 			} catch (e) {
 				return null;
 			}