Fixed: Livesync on Android is not working after changes in tns-core-modules

Author: Tsvetan Raikov

lib/commands/debug.ts

@@ -15,12 +15,12 @@
 			let applicationReloadAction = (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]): IFuture<void> => {
 				return (() => {
 					let projectData: IProjectData = this.$injector.resolve("projectData");
-
 					this.debugService.debugStop().wait();
-
-					let applicationId = deviceAppData.device.isEmulator ? projectData.projectName : deviceAppData.appIdentifier;
+					let applicationId = deviceAppData.appIdentifier;
+					if (deviceAppData.device.isEmulator && deviceAppData.platform.toLowerCase() === this.$devicePlatformsConstants.iOS.toLocaleLowerCase()) {
+						applicationId = projectData.projectName;
+					}
 					deviceAppData.device.applicationManager.stopApplication(applicationId).wait();
-
 					this.debugService.debug().wait();
 				}).future<void>()();
 			};

lib/definitions/platform.d.ts

@@ -15,6 +15,7 @@ interface IPlatformService {
 	deployOnEmulator(platform: string, buildConfig?: IBuildConfig): IFuture<void>;
 	validatePlatformInstalled(platform: string): void;
 	validatePlatform(platform: string): void;
+	isPlatformBuilt(platform: string): IFuture<boolean>;
 
 	getLatestApplicationPackageForDevice(platformData: IPlatformData): IFuture<IApplicationPackage>;
 	getLatestApplicationPackageForEmulator(platformData: IPlatformData): IFuture<IApplicationPackage>;

lib/definitions/project.d.ts

@@ -94,6 +94,7 @@ interface IPlatformProjectService {
 	 * Ensures there is configuration file (AndroidManifest.xml, Info.plist) in app/App_Resources.
 	 */
 	ensureConfigurationFileInAppResources(): IFuture<void>;
+	isPlatformBuilt(projectRoot: string): IFuture<boolean>;
 }
 
 interface IAndroidProjectPropertiesManager {

lib/services/android-project-service.ts

@@ -298,6 +298,10 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		return this.$fs.exists(path.join(this.platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME));
 	}
 
+	public isPlatformBuilt(projectRoot: string): IFuture<boolean> {
+		return this.$fs.exists(path.join(projectRoot, "build", "outputs", "apk"));
+	}
+
 	public getFrameworkFilesExtensions(): string[] {
 		return [".jar", ".dat"];
 	}
@@ -406,6 +410,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 
 	public beforePrepareAllPlugins(): IFuture<void> {
 		let buildOptions = this.getBuildOptions();
+
 		buildOptions.unshift("clean");
 
 		let projectRoot = this.platformData.projectRoot;

lib/services/ios-project-service.ts

@@ -357,6 +357,10 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		return this.$fs.exists(path.join(projectRoot, this.$projectData.projectName, constants.APP_FOLDER_NAME));
 	}
 
+	public isPlatformBuilt(projectRoot: string): IFuture<boolean> {
+		return this.$fs.exists(path.join(projectRoot, "build"));
+	}
+
 	public deploy(deviceIdentifier: string): IFuture<void> {
 		return Future.fromResult();
 	}

lib/services/livesync/android-platform-livesync-service.ts

@@ -11,8 +11,9 @@ class AndroidPlatformLiveSyncService extends PlatformLiveSyncServiceBase {
 		protected $injector: IInjector,
 		protected $projectFilesManager: IProjectFilesManager,
 		protected $projectFilesProvider: IProjectFilesProvider,
+		protected $platformService: IPlatformService,
 		protected $liveSyncProvider: ILiveSyncProvider) {
-		super(_liveSyncData, $devicesService, $mobileHelper, $logger, $options, $deviceAppDataFactory, $fs, $injector, $projectFilesManager, $projectFilesProvider, $liveSyncProvider);
+		super(_liveSyncData, $devicesService, $mobileHelper, $logger, $options, $deviceAppDataFactory, $fs, $injector, $projectFilesManager, $projectFilesProvider, $platformService, $liveSyncProvider);
 	}
 
 	public fullSync(postAction?: (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => IFuture<void>): IFuture<void> {

lib/services/livesync/ios-platform-livesync-service.ts

@@ -11,8 +11,9 @@ class IOSPlatformLiveSyncService extends PlatformLiveSyncServiceBase {
 		protected $injector: IInjector,
 		protected $projectFilesManager: IProjectFilesManager,
 		protected $projectFilesProvider: IProjectFilesProvider,
+		protected $platformService: IPlatformService,
 		protected $liveSyncProvider: ILiveSyncProvider) {
-		super(_liveSyncData, $devicesService, $mobileHelper, $logger, $options, $deviceAppDataFactory, $fs, $injector, $projectFilesManager, $projectFilesProvider, $liveSyncProvider);
+		super(_liveSyncData, $devicesService, $mobileHelper, $logger, $options, $deviceAppDataFactory, $fs, $injector, $projectFilesManager, $projectFilesProvider, $platformService, $liveSyncProvider);
 	}
 
 	public fullSync(postAction?: (deviceAppData: Mobile.IDeviceAppData, localToDevicePaths: Mobile.ILocalToDevicePathData[]) => IFuture<void>): IFuture<void> {

lib/services/livesync/platform-livesync-service-base.ts

@@ -24,6 +24,7 @@ export abstract class PlatformLiveSyncServiceBase implements IPlatformLiveSyncSe
 		protected $injector: IInjector,
 		protected $projectFilesManager: IProjectFilesManager,
 		protected $projectFilesProvider: IProjectFilesProvider,
+		protected $platformService: IPlatformService,
 		protected $liveSyncProvider: ILiveSyncProvider) {
 		this.liveSyncData = _liveSyncData;
 		this.fileHashes = Object.create(null);
@@ -78,7 +79,7 @@ export abstract class PlatformLiveSyncServiceBase implements IPlatformLiveSyncSe
 			device.applicationManager.checkForApplicationUpdates().wait();
 
 			let appIdentifier = this.liveSyncData.appIdentifier;
-			if (!device.applicationManager.isApplicationInstalled(appIdentifier).wait()) {
+			if (!device.applicationManager.isApplicationInstalled(appIdentifier).wait() || !this.$platformService.isPlatformBuilt(deviceAppData.platform.toLowerCase()).wait()) {
 				this.$logger.warn(`The application with id "${appIdentifier}" is not installed on device with identifier ${device.deviceInfo.identifier}.`);
 
 				let packageFilePath = this.$liveSyncProvider.buildForDevice(device).wait();

lib/services/platform-service.ts

@@ -618,6 +618,11 @@ export class PlatformService implements IPlatformService {
 		return platformData.platformProjectService.isPlatformPrepared(platformData.projectRoot);
 	}
 
+	public isPlatformBuilt(platform: string): IFuture<boolean> {
+		let platformData = this.$platformsData.getPlatformData(platform);
+		return platformData.platformProjectService.isPlatformBuilt(platformData.projectRoot);
+	}
+
 	private getApplicationPackages(buildOutputPath: string, validPackageNames: string[]): IFuture<IApplicationPackage[]> {
 		return (() => {
 			// Get latest package that is produced from build

lib/tools/broccoli/node-modules-dest-copy.ts

@@ -24,6 +24,7 @@ export class DestCopy implements IBroccoliPlugin {
 		private $fs: IFileSystem,
 		private $projectFilesManager: IProjectFilesManager,
 		private $pluginsService: IPluginsService,
+		private $config: IConfiguration,
 		private $platformsData: IPlatformsData
 	) {
 		this.dependencies = Object.create(null);
@@ -69,7 +70,7 @@ export class DestCopy implements IBroccoliPlugin {
 				});
 			}
 		});
-		if (!_.isEmpty(this.dependencies)) {
+		if (!_.isEmpty(this.dependencies) && !this.$config.debugLivesync) {
 			this.$platformsData.getPlatformData(platform).platformProjectService.beforePrepareAllPlugins().wait();
 		}
 

test/stubs.ts

@@ -324,6 +324,9 @@ export class PlatformProjectServiceStub implements IPlatformProjectService {
 	isPlatformPrepared(projectRoot: string): IFuture<boolean> {
 		return Future.fromResult(false);
 	}
+	isPlatformBuilt(projectRoot: string): IFuture<boolean> {
+		return Future.fromResult(false);
+	}
 	canUpdatePlatform(currentVersion: string, newVersion: string): IFuture<boolean> {
 		return Future.fromResult(false);
 	}