fix: app not restarted if in error activity

Author: KristianDD

lib/definitions/livesync.d.ts

@@ -414,7 +414,7 @@ interface IAndroidLivesyncTool {
 	 * @param timeout - The timeout in milliseconds
 	 * @returns {Promise<void>}
 	 */
-	sendDoSyncOperation(operationId: string, timeout?: number): Promise<void>;
+	sendDoSyncOperation(operationId: string, timeout?: number): Promise<IAndroidLivesyncSyncOperationResult>;
 	/**
 	 * Generates new operation identifier.
 	 */
@@ -454,6 +454,11 @@ interface IAndroidLivesyncToolConfiguration {
 	errorHandler?: any;
 }
 
+interface IAndroidLivesyncSyncOperationResult {
+	operationId: string,
+	didRefresh: boolean
+}
+
 interface IDeviceProjectRootOptions {
 	appIdentifier: string;
 	getDirname?: boolean;

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

@@ -50,9 +50,9 @@ export class AndroidDeviceSocketsLiveSyncService extends DeviceLiveSyncServiceBa
 			this.$processService.attachToProcessExitSignals(this, clearSyncInterval);
 			doSyncPromise.then(clearSyncInterval, clearSyncInterval);
 
-			await doSyncPromise;
+			const refreshResult = await doSyncPromise;
 
-			if (!canExecuteFastSync) {
+			if (!canExecuteFastSync || !refreshResult.didRefresh) {
 				await this.device.applicationManager.restartApplication({ appId: liveSyncInfo.deviceAppData.appIdentifier, projectName: projectData.projectName });
 			}
 		}
@@ -61,7 +61,7 @@ export class AndroidDeviceSocketsLiveSyncService extends DeviceLiveSyncServiceBa
 	}
 
 	public async removeFiles(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[], projectFilesPath: string): Promise<void> {
-		await this.livesyncTool.removeFiles(_.map(localToDevicePaths, (element: any) => { return element.filePath; }));
+		await this.livesyncTool.removeFiles(_.map(localToDevicePaths, (element: any) => element.filePath));
 	}
 
 	public async transferFiles(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[], projectFilesPath: string, isFullSync: boolean): Promise<Mobile.ILocalToDevicePathData[]> {

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

@@ -10,6 +10,7 @@ const CREATE_FILE_OPERATION = 8;
 const DO_SYNC_OPERATION = 9;
 const ERROR_REPORT = 1;
 const OPERATION_END_REPORT = 2;
+const OPERATION_END_NO_REFRESH_REPORT_CODE = 3;
 const REPORT_LENGTH = 1;
 const DEFAULT_LOCAL_HOST_ADDRESS = "127.0.0.1";
 
@@ -118,9 +119,9 @@ export class AndroidLivesyncTool implements IAndroidLivesyncTool {
 		return !!this.operationPromises[operationId];
 	}
 
-	public sendDoSyncOperation(operationId: string, timeout: number): Promise<any> {
+	public sendDoSyncOperation(operationId: string, timeout: number): Promise<IAndroidLivesyncSyncOperationResult> {
 		const id = operationId || this.generateOperationIdentifier();
-		const operationPromise = new Promise((resolve: Function, reject: Function) => {
+		const operationPromise: Promise<IAndroidLivesyncSyncOperationResult> = new Promise((resolve: Function, reject: Function) => {
 			this.verifyActiveConnection(reject);
 
 			const message = `${DO_SYNC_OPERATION}${id}`;
@@ -328,16 +329,18 @@ export class AndroidLivesyncTool implements IAndroidLivesyncTool {
 			const errorMessage = infoBuffer.toString();
 			this.handleSocketError(socketId, errorMessage);
 		} else if (reportType === OPERATION_END_REPORT) {
-			this.handleSyncEnd(infoBuffer);
+			this.handleSyncEnd({data:infoBuffer, didRefresh: true});
+		} else if (reportType === OPERATION_END_NO_REFRESH_REPORT_CODE) {
+			this.handleSyncEnd({data:infoBuffer, didRefresh: false});
 		}
 	}
 
-	private handleSyncEnd(data: any) {
+	private handleSyncEnd({data, didRefresh}: {data: any, didRefresh: boolean}) {
 		const operationId = data.toString();
 		const promiseHandler = this.operationPromises[operationId];
 
 		if (promiseHandler) {
-			promiseHandler.resolve(operationId);
+			promiseHandler.resolve({operationId, didRefresh});
 			delete this.operationPromises[operationId];
 		}
 	}