Fix run, livesync, run workflow

Fixes NativeScript/nativescript-cli#896
telerik · Sep 10, 2015 · 2d5439e · 2d5439e
1 parent 09f4889
commit 2d5439e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/definitions/mobile.d.ts b/definitions/mobile.d.ts
@@ -70,6 +70,7 @@ declare module Mobile {
 		getInstalledApplications(): IFuture<string[]>;
 		installApplication(packageFilePath: string): IFuture<void>;
 		uninstallApplication(appIdentifier: string): IFuture<void>;
+		reinstallApplication(applicationId: string, packageFilePath: string): IFuture<void>;
 		startApplication(appIdentifier: string): IFuture<void>;
 		stopApplication(appIdentifier: string): IFuture<void>;
 		restartApplication(applicationId: string): IFuture<void>;

diff --git a/mobile/android/android-application-manager.ts b/mobile/android/android-application-manager.ts
@@ -31,6 +31,13 @@ export class AndroidApplicationManager implements Mobile.IDeviceApplicationManag
 		return this.adb.executeShellCommand(["pm", "uninstall", `${appIdentifier}`]);
 	}
 
+	public reinstallApplication(applicationId: string, packageFilePath: string): IFuture<void> {
+		return (() => {
+			this.uninstallApplication(applicationId).wait();
+			this.installApplication(packageFilePath).wait();
+		}).future<void>()();
+	}
+
 	public startApplication(appIdentifier: string): IFuture<void> {
 		return this.adb.executeShellCommand(["am", "start",
 			"-a", "android.intent.action.MAIN",

diff --git a/mobile/android/android-device.ts b/mobile/android/android-device.ts
@@ -48,8 +48,7 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
 
 	public deploy(packageFile: string, packageName: string): IFuture<void> {
 		return (() => {
-			this.applicationManager.uninstallApplication(packageName).wait();
-			this.applicationManager.installApplication(packageFile).wait();
+			this.applicationManager.reinstallApplication(packageName, packageFile).wait();
 			this.applicationManager.startApplication(packageName).wait();
 			this.$logger.info("Successfully deployed on device with identifier '%s'", this.identifier);
 		}).future<void>()();

diff --git a/mobile/ios/ios-application-manager.ts b/mobile/ios/ios-application-manager.ts
@@ -58,6 +58,13 @@ export class IOSApplicationManager implements Mobile.IDeviceApplicationManager {
 		}).future<void>()();
 	}
 
+	public reinstallApplication(applicationId: string, packageFilePath: string): IFuture<void> {
+		return (() => {
+			this.uninstallApplication(applicationId).wait();
+			this.installApplication(packageFilePath).wait();
+		}).future<void>()();
+	}
+
 	public startApplication(applicationId: string): IFuture<void> {
 		return (() => {
 			if(this.$hostInfo.isWindows && !this.$staticConfig.enableDeviceRunCommandOnWindows) {

diff --git a/mobile/ios/ios-device.ts b/mobile/ios/ios-device.ts
@@ -290,8 +290,8 @@ export class IOSDevice implements Mobile.IiOSDevice {
 		return this.tryExecuteFunction<number>(func);
 	}
 
-	public deploy(packageFile: string): IFuture<void> {
-		return this.applicationManager.installApplication(packageFile);
+	public deploy(packageFile: string, packageName: string): IFuture<void> {
+		return this.applicationManager.reinstallApplication(packageName, packageFile);
 	}
 
 	public openDeviceLogStream() {