Speed up android livesync

Author: Fatme

lib/common

@@ -30,7 +30,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		private $npm: INodePackageManager,
 		private $androidPluginBuildService: IAndroidPluginBuildService,
 		private $platformEnvironmentRequirements: IPlatformEnvironmentRequirements,
-		private $androidResourcesMigrationService: IAndroidResourcesMigrationService) {
+		private $androidResourcesMigrationService: IAndroidResourcesMigrationService,
+		private $filesHashService: IFilesHashService) {
 		super($fs, $projectDataService);
 		this.isAndroidStudioTemplate = false;
 	}
@@ -332,6 +333,16 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 				message: "Gradle build..."
 			})
 		);
+
+		await this.generateHashes();
+	}
+
+	private async generateHashes(): Promise<void> {
+		const projectFilesPath = path.join(this._platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);
+		const files = this.$fs.enumerateFilesInDirectorySync(projectFilesPath);
+		const hashes = await this.$filesHashService.generateHashes(files);
+		const hashesFilePath = path.join(this._platformData.deviceBuildOutputPath, "hashes");
+		this.$fs.writeJson(hashesFilePath, hashes);
 	}
 
 	private getGradleBuildOptions(settings: IAndroidBuildOptionsSettings, projectData: IProjectData): Array<string> {

lib/services/android-project-service.ts

@@ -106,6 +106,11 @@ export class AndroidDeviceSocketsLiveSyncService extends DeviceLiveSyncServiceBa
 		return transferredFiles;
 	}
 
+	public getDeviceHashService(appIdentifier: string): Mobile.IAndroidDeviceHashService {
+		const adb = this.$injector.resolve(DeviceAndroidDebugBridge, { identifier: this.device.deviceInfo.identifier });
+		return this.$injector.resolve(AndroidDeviceHashService, { adb, appIdentifier });
+	}
+
 	private async _transferFiles(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]): Promise<Mobile.ILocalToDevicePathData[]> {
 		await this.livesyncTool.sendFiles(localToDevicePaths.map(localToDevicePathData => localToDevicePathData.getLocalPath()));
 
@@ -121,19 +126,19 @@ export class AndroidDeviceSocketsLiveSyncService extends DeviceLiveSyncServiceBa
 	private async _transferDirectory(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[], projectFilesPath: string): Promise<Mobile.ILocalToDevicePathData[]> {
 		let transferredLocalToDevicePaths: Mobile.ILocalToDevicePathData[];
 		const deviceHashService = this.getDeviceHashService(deviceAppData.appIdentifier);
-		const currentShasums: IStringDictionary = await deviceHashService.generateHashesFromLocalToDevicePaths(localToDevicePaths);
-		const oldShasums = await deviceHashService.getShasumsFromDevice();
+		const currentHashes = await deviceHashService.generateHashesFromLocalToDevicePaths(localToDevicePaths);
+		const oldHashes = await deviceHashService.getShasumsFromDevice();
 
-		if (this.$options.force || !oldShasums) {
+		if (this.$options.force || !oldHashes) {
 			await this.livesyncTool.sendDirectory(projectFilesPath);
-			await deviceHashService.uploadHashFileToDevice(currentShasums);
+			await deviceHashService.uploadHashFileToDevice(currentHashes);
 			transferredLocalToDevicePaths = localToDevicePaths;
 		} else {
-			const changedShasums = deviceHashService.getChangedShasums(oldShasums, currentShasums);
+			const changedShasums = deviceHashService.getChangedShasums(oldHashes, currentHashes);
 			const changedFiles = _.keys(changedShasums);
 			if (changedFiles.length) {
 				await this.livesyncTool.sendFiles(changedFiles);
-				await deviceHashService.uploadHashFileToDevice(currentShasums);
+				await deviceHashService.uploadHashFileToDevice(currentHashes);
 				transferredLocalToDevicePaths = localToDevicePaths.filter(localToDevicePathData => changedFiles.indexOf(localToDevicePathData.getLocalPath()) >= 0);
 			} else {
 				transferredLocalToDevicePaths = [];
@@ -150,9 +155,4 @@ export class AndroidDeviceSocketsLiveSyncService extends DeviceLiveSyncServiceBa
 			appPlatformsPath: projectFilesPath
 		});
 	}
-
-	public getDeviceHashService(appIdentifier: string): Mobile.IAndroidDeviceHashService {
-		const adb = this.$injector.resolve(DeviceAndroidDebugBridge, { identifier: this.device.deviceInfo.identifier });
-		return this.$injector.resolve(AndroidDeviceHashService, { adb, appIdentifier });
-	}
 }

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

@@ -481,6 +481,8 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 
 		await platformData.platformProjectService.cleanDeviceTempFolder(device.deviceInfo.identifier, projectData);
 
+		await this.uploadHashesToDevice(device, projectData, platformData);
+
 		await device.applicationManager.reinstallApplication(projectData.projectId, packageFile);
 
 		if (!buildConfig.release) {
@@ -496,6 +498,27 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		this.$logger.out(`Successfully installed on device with identifier '${device.deviceInfo.identifier}'.`);
 	}
 
+	private async uploadHashesToDevice(device: Mobile.IDevice, projectData: IProjectData, platformData: IPlatformData) {
+		const isApplicationInstalled = await device.applicationManager.isApplicationInstalled(projectData.projectId);
+		if (isApplicationInstalled) {
+			const deviceAppData = {
+				appIdentifier: projectData.projectId,
+				device,
+				platform: device.deviceInfo.platform,
+				getDeviceProjectRootPath: () => this.$devicePathProvider.getDeviceProjectRootPath(device, { appIdentifier: projectData.projectId }),
+				deviceSyncZipPath: this.$devicePathProvider.getDeviceSyncZipPath(device),
+				isLiveSyncSupported: async () => true
+			};
+			await device.fileSystem.updateHashesOnDevice(deviceAppData, path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME));
+		} else {
+			const hashesFilePath = path.join(platformData.deviceBuildOutputPath, "hashes");
+			if (this.$fs.exists(hashesFilePath)) {
+				const hashes = this.$fs.readJson(hashesFilePath);
+				await device.fileSystem.uploadHashesToDevice(hashes, projectData.projectId);
+			}
+		}
+	}
+
 	public async deployPlatform(deployInfo: IDeployPlatformInfo): Promise<void> {
 		await this.preparePlatform({
 			platform: deployInfo.platform,