Merge pull request #3917 from NativeScript/fatme/fix-android-livesync

chore: sync correctly deleted files on android devices

Author: Fatme

lib/definitions/livesync.d.ts

@@ -465,7 +465,7 @@ interface IAndroidLivesyncTool {
 	 * @param filePaths - Array of files that will be removed.
 	 * @returns {Promise<boolean[]>}
 	 */
-	removeFiles(filePaths: string[]): Promise<void[]>;
+	removeFiles(filePaths: string[]): Promise<void>;
 	/**
 	 * Sends doSyncOperation that will be handled by the runtime.
 	 * @param options

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

@@ -48,6 +48,7 @@ export class AndroidDeviceSocketsLiveSyncService extends AndroidDeviceLiveSyncSe
 			return result;
 		} catch (e) {
 			this.livesyncTool.end();
+			throw e;
 		}
 	}
 

lib/services/livesync/android-livesync-tool.ts

@@ -104,26 +104,27 @@ export class AndroidLivesyncTool implements IAndroidLivesyncTool {
 	}
 
 	public async removeFile(filePath: string): Promise<void> {
-			this.verifyActiveConnection();
-			const filePathData = this.getFilePathData(filePath);
-			const headerBuffer = Buffer.alloc(PROTOCOL_OPERATION_LENGTH_SIZE +
-				SIZE_BYTE_LENGTH +
-				filePathData.filePathLengthSize +
-				filePathData.filePathLengthBytes);
-
-			let offset = 0;
-			offset += headerBuffer.write(AndroidLivesyncTool.DELETE_FILE_OPERATION.toString(), offset, PROTOCOL_OPERATION_LENGTH_SIZE);
-			offset = headerBuffer.writeInt8(filePathData.filePathLengthSize, offset);
-			offset += headerBuffer.write(filePathData.filePathLengthString, offset, filePathData.filePathLengthSize);
-			headerBuffer.write(filePathData.relativeFilePath, offset, filePathData.filePathLengthBytes);
-			const hash = crypto.createHash("md5").update(headerBuffer).digest();
-
-			await this.writeToSocket(headerBuffer);
-			await this.writeToSocket(hash);
+		this.verifyActiveConnection();
+		const filePathData = this.getFilePathData(filePath);
+		const headerBuffer = Buffer.alloc(PROTOCOL_OPERATION_LENGTH_SIZE +
+			SIZE_BYTE_LENGTH +
+			filePathData.filePathLengthSize +
+			filePathData.filePathLengthBytes);
+
+		let offset = 0;
+		offset += headerBuffer.write(AndroidLivesyncTool.DELETE_FILE_OPERATION.toString(), offset, PROTOCOL_OPERATION_LENGTH_SIZE);
+		offset = headerBuffer.writeInt8(filePathData.filePathLengthSize, offset);
+		offset += headerBuffer.write(filePathData.filePathLengthString, offset, filePathData.filePathLengthSize);
+		headerBuffer.write(filePathData.relativeFilePath, offset, filePathData.filePathLengthBytes);
+		const hash = crypto.createHash("md5").update(headerBuffer).digest();
+
+		await this.writeToSocket(headerBuffer);
+		await this.writeToSocket(hash);
 	}
-
-	public removeFiles(files: string[]) {
-		return Promise.all(files.map(file => this.removeFile(file)));
+	public async removeFiles(files: string[]): Promise<void> {
+		for (const file of files) {
+			await this.removeFile(file);
+		}
 	}
 
 	public generateOperationIdentifier(): string {
@@ -265,6 +266,7 @@ export class AndroidLivesyncTool implements IAndroidLivesyncTool {
 		const error = this.checkConnectionStatus();
 		if (error && rejectHandler) {
 			rejectHandler(error);
+			return false;
 		}
 
 		if (error && !rejectHandler) {