Fix stop application on iOS simulator (#2645)

TsvetanMilanov · web-flow · commit 064aae028731 · 2017-03-23T18:47:44.000+02:00
We need to pass the project name instead of the app identifier to kill the application on the simulator.
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit 85feb33fc790878b7c13729cb3079b74266ff14e
+Subproject commit f9990aa9779b2c4a5601071381f69a13b1f8e114
diff --git a/lib/services/livesync/ios-device-livesync-service.ts b/lib/services/livesync/ios-device-livesync-service.ts
@@ -62,7 +62,7 @@ class IOSLiveSyncService implements INativeScriptDeviceLiveSyncService {
 
 	public async refreshApplication(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[], forceExecuteFullSync: boolean, projectData: IProjectData): Promise<void> {
 		if (forceExecuteFullSync) {
-			await this.restartApplication(deviceAppData);
+			await this.restartApplication(deviceAppData, projectData.projectName);
 			return;
 		}
 
@@ -74,20 +74,20 @@ class IOSLiveSyncService implements INativeScriptDeviceLiveSyncService {
 		let shouldRestart = _.some(otherFiles, (localToDevicePath: Mobile.ILocalToDevicePathData) => !this.$liveSyncProvider.canExecuteFastSync(localToDevicePath.getLocalPath(), projectData, deviceAppData.platform));
 
 		if (shouldRestart || (!this.$options.liveEdit && scriptFiles.length)) {
-			await this.restartApplication(deviceAppData);
+			await this.restartApplication(deviceAppData, projectData.projectName);
 			return;
 		}
 
 		if (await this.setupSocketIfNeeded(projectData.projectId)) {
 			this.liveEdit(scriptFiles);
 			await this.reloadPage(deviceAppData, otherFiles);
 		} else {
-			await this.restartApplication(deviceAppData);
+			await this.restartApplication(deviceAppData, projectData.projectName);
 		}
 	}
 
-	private async restartApplication(deviceAppData: Mobile.IDeviceAppData): Promise<void> {
-		return this.device.applicationManager.restartApplication(deviceAppData.appIdentifier);
+	private async restartApplication(deviceAppData: Mobile.IDeviceAppData, appName: string): Promise<void> {
+		return this.device.applicationManager.restartApplication(deviceAppData.appIdentifier, appName);
 	}
 
 	private async reloadPage(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]): Promise<void> {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class IOSLiveSyncService implements INativeScriptDeviceLiveSyncService {`
`62`	`62`
`63`	`63`	`public async refreshApplication(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[], forceExecuteFullSync: boolean, projectData: IProjectData): Promise<void> {`
`64`	`64`	`if (forceExecuteFullSync) {`
`65`		`- await this.restartApplication(deviceAppData);`
	`65`	`+ await this.restartApplication(deviceAppData, projectData.projectName);`
`66`	`66`	`return;`
`67`	`67`	`}`
`68`	`68`
`@@ -74,20 +74,20 @@ class IOSLiveSyncService implements INativeScriptDeviceLiveSyncService {`
`74`	`74`	`let shouldRestart = _.some(otherFiles, (localToDevicePath: Mobile.ILocalToDevicePathData) => !this.$liveSyncProvider.canExecuteFastSync(localToDevicePath.getLocalPath(), projectData, deviceAppData.platform));`
`75`	`75`
`76`	`76`	`if (shouldRestart \|\| (!this.$options.liveEdit && scriptFiles.length)) {`
`77`		`- await this.restartApplication(deviceAppData);`
	`77`	`+ await this.restartApplication(deviceAppData, projectData.projectName);`
`78`	`78`	`return;`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`if (await this.setupSocketIfNeeded(projectData.projectId)) {`
`82`	`82`	`this.liveEdit(scriptFiles);`
`83`	`83`	`await this.reloadPage(deviceAppData, otherFiles);`
`84`	`84`	`} else {`
`85`		`- await this.restartApplication(deviceAppData);`
	`85`	`+ await this.restartApplication(deviceAppData, projectData.projectName);`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`89`		`- private async restartApplication(deviceAppData: Mobile.IDeviceAppData): Promise<void> {`
`90`		`- return this.device.applicationManager.restartApplication(deviceAppData.appIdentifier);`
	`89`	`+ private async restartApplication(deviceAppData: Mobile.IDeviceAppData, appName: string): Promise<void> {`
	`90`	`+ return this.device.applicationManager.restartApplication(deviceAppData.appIdentifier, appName);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`private async reloadPage(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]): Promise<void> {`