chore: remove unused isLiveSyncSupported methods

rosen-vladimirov · rosen-vladimirov · commit 687a02bf4508 · 2019-01-27T01:22:43.000+02:00
Remove unused `isLiveSyncSupported` methods, which were checking if the application can be LiveSynced via AppBuilder's LiveSync plugin that is no longer supported.
diff --git a/lib/common/constants.ts b/lib/common/constants.ts
@@ -37,17 +37,6 @@ export class LiveSyncPaths {
 	static ANDROID_TMP_DIR_NAME = "/data/local/tmp";
 }
 
-export class LiveSyncConstants {
-	static VERSION_2 = 2;
-	static VERSION_3 = 3;
-	static GUID = "12590FAA-5EDD-4B12-856D-F52A0A1599F2";
-	static DEVICE_TMP_DIR_FORMAT_V2 = `${LiveSyncPaths.ANDROID_TMP_DIR_NAME}/${LiveSyncConstants.GUID}/%s`;
-	static ANDROID_FILES_PATH = `files/${LiveSyncConstants.GUID}`;
-	static DEVICE_TMP_DIR_FORMAT_V3 = `/mnt/sdcard/Android/data/%s/${LiveSyncConstants.ANDROID_FILES_PATH}`;
-	static CHECK_LIVESYNC_INTENT_NAME = "com.telerik.IsLiveSyncSupported";
-	static IOS_PROJECT_PATH = "/Documents/AppBuilder/LiveSync";
-}
-
 export class HmrConstants {
 	public static HMR_ERROR_STATUS = 3;
 	public static HMR_SUCCESS_STATUS = 2;
diff --git a/lib/common/declarations.d.ts b/lib/common/declarations.d.ts
@@ -1639,3 +1639,13 @@ declare module "detect-newline" {
 	function detectNewline(data: string): string | null;
 	export = detectNewline
 }
+
+/**
+ * Describes information for application.
+ */
+interface IAppInstalledInfo extends Mobile.IDeviceApplicationInformationBase {
+	/**
+	 * Defines if application is installed on device.
+	 */
+	isInstalled: boolean;
+}
diff --git a/lib/common/definitions/mobile.d.ts b/lib/common/definitions/mobile.d.ts
@@ -1,24 +1,3 @@
-/**
- * Describes if LiveSync is supported for specific device and application.
- */
-interface ILiveSyncSupportedInfo extends Mobile.IDeviceApplicationInformationBase {
-	/**
-	 * Result, indicating is livesync supported for specified device and specified application.
-	 * `true` in case livesync is supported and false otherwise.
-	 */
-	isLiveSyncSupported: boolean;
-}
-
-/**
- * Describes if LiveSync is supported for specific device and application.
- */
-interface IAppInstalledInfo extends ILiveSyncSupportedInfo {
-	/**
-	 * Defines if application is installed on device.
-	 */
-	isInstalled: boolean;
-}
-
 declare module Mobile {
 	interface ISyncOptions {
 		skipRefresh?: boolean;
@@ -122,7 +101,6 @@ declare module Mobile {
 		fileSystem: Mobile.IDeviceFileSystem;
 		isEmulator: boolean;
 		openDeviceLogStream(): Promise<void>;
-		getApplicationInfo(applicationIdentifier: string): Promise<Mobile.IApplicationInfo>;
 
 		/**
 		 * Called when device is lost. Its purpose is to clean any resources used by the instance.
@@ -171,7 +149,6 @@ declare module Mobile {
 		device: Mobile.IDevice;
 		getDeviceProjectRootPath(): Promise<string>;
 		deviceSyncZipPath?: string;
-		isLiveSyncSupported(): Promise<boolean>;
 	}
 
 	interface ILogcatStartOptions {
@@ -321,24 +298,11 @@ declare module Mobile {
 		stopApplication(appData: IApplicationData): Promise<void>;
 		restartApplication(appData: IStartApplicationData): Promise<void>;
 		checkForApplicationUpdates(): Promise<void>;
-		isLiveSyncSupported(appIdentifier: string): Promise<boolean>;
-		getApplicationInfo(applicationIdentifier: string): Promise<Mobile.IApplicationInfo>;
 		tryStartApplication(appData: IApplicationData): Promise<void>;
 		getDebuggableApps(): Promise<Mobile.IDeviceApplicationInformation[]>;
 		getDebuggableAppViews(appIdentifiers: string[]): Promise<IDictionary<Mobile.IDebugWebViewInfo[]>>;
 	}
 
-	/**
-	 * Describes information about livesync in an application.
-	 */
-	interface ILiveSyncApplicationInfo extends IApplicationInfo {
-		/**
-		 * Whether LiveSync is supported
-		 * @type {boolean}
-		 */
-		isLiveSyncSupported: boolean;
-	}
-
 	/**
 	 * Describes information about an application.
 	 */
@@ -699,13 +663,13 @@ declare module Mobile {
 		create(fileName: string, localProjectRootPath: string, onDeviceFileName: string, deviceProjectRootPath: string): Mobile.ILocalToDevicePathData;
 	}
 
+	// TODO: Remove
 	interface IPlatformCapabilities {
 		wirelessDeploy?: boolean;
 		cableDeploy: boolean;
 		companion?: boolean;
 		hostPlatformsForDeploy: string[];
 	}
-
 	interface IAvdInfo extends IDictionary<string | number> {
 		target: string;
 		targetNum: number;
@@ -1045,11 +1009,11 @@ declare module Mobile {
 		timeout?: number;
 	}
 
+	// TODO: Consider removing
 	interface IPlatformsCapabilities {
 		getPlatformNames(): string[];
 		getAllCapabilities(): IDictionary<Mobile.IPlatformCapabilities>;
 	}
-
 	interface IMobileHelper {
 		platformNames: string[];
 		isAndroidPlatform(platform: string): boolean;
diff --git a/lib/common/mobile/android/android-application-manager.ts b/lib/common/mobile/android/android-application-manager.ts
@@ -1,6 +1,6 @@
 import { EOL } from "os";
 import { ApplicationManagerBase } from "../application-manager-base";
-import { LiveSyncConstants, TARGET_FRAMEWORK_IDENTIFIERS, LiveSyncPaths } from "../../constants";
+import {TARGET_FRAMEWORK_IDENTIFIERS, LiveSyncPaths } from "../../constants";
 import { hook, sleep, regExpEscape } from "../../helpers";
 import { cache } from "../../decorators";
 
@@ -121,16 +121,6 @@ export class AndroidApplicationManager extends ApplicationManagerBase {
 		return this.adb.executeShellCommand(["am", "force-stop", `${appData.appId}`]);
 	}
 
-	public getApplicationInfo(applicationIdentifier: string): Promise<Mobile.IApplicationInfo> {
-		// This method is currently only used in the ios application managers. Configurations for Android are acquired through filesystem listing.
-		return Promise.resolve(null);
-	}
-
-	public async isLiveSyncSupported(appIdentifier: string): Promise<boolean> {
-		const liveSyncVersion = await this.adb.sendBroadcastToDevice(LiveSyncConstants.CHECK_LIVESYNC_INTENT_NAME, { "app-id": appIdentifier });
-		return liveSyncVersion === LiveSyncConstants.VERSION_2 || liveSyncVersion === LiveSyncConstants.VERSION_3;
-	}
-
 	public getDebuggableApps(): Promise<Mobile.IDeviceApplicationInformation[]> {
 		return this.$androidProcessService.getDebuggableApps(this.identifier);
 	}
diff --git a/lib/common/mobile/android/android-device.ts b/lib/common/mobile/android/android-device.ts
@@ -96,22 +96,6 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
 		return this.deviceInfo.type === constants.DeviceTypes.Emulator;
 	}
 
-	public async getApplicationInfo(applicationIdentifier: string): Promise<Mobile.IApplicationInfo> {
-		const files = await this.fileSystem.listFiles(constants.LiveSyncConstants.ANDROID_FILES_PATH, applicationIdentifier);
-		const androidFilesMatch = files.match(/(\S+)\.abproject/);
-		let result: Mobile.IApplicationInfo = null;
-
-		if (androidFilesMatch && androidFilesMatch[1]) {
-			result = {
-				deviceIdentifier: this.deviceInfo.identifier,
-				configuration: androidFilesMatch[1],
-				applicationIdentifier
-			};
-		}
-
-		return result;
-	}
-
 	public async openDeviceLogStream(): Promise<void> {
 		if (this.deviceInfo.status === constants.CONNECTED_STATUS) {
 			await this.$logcatHelper.start({
diff --git a/lib/common/mobile/application-manager-base.ts b/lib/common/mobile/application-manager-base.ts
@@ -76,14 +76,11 @@ export abstract class ApplicationManagerBase extends EventEmitter implements Mob
 		}
 	}
 
-	public abstract async isLiveSyncSupported(appIdentifier: string): Promise<boolean>;
-
 	public abstract async installApplication(packageFilePath: string, appIdentifier?: string): Promise<void>;
 	public abstract async uninstallApplication(appIdentifier: string): Promise<void>;
 	public abstract async startApplication(appData: Mobile.IApplicationData): Promise<void>;
 	public abstract async stopApplication(appData: Mobile.IApplicationData): Promise<void>;
 	public abstract async getInstalledApplications(): Promise<string[]>;
-	public abstract async getApplicationInfo(applicationIdentifier: string): Promise<Mobile.IApplicationInfo>;
 	public abstract async getDebuggableApps(): Promise<Mobile.IDeviceApplicationInformation[]>;
 	public abstract async getDebuggableAppViews(appIdentifiers: string[]): Promise<IDictionary<Mobile.IDebugWebViewInfo[]>>;
 
diff --git a/lib/common/mobile/ios/device/ios-application-manager.ts b/lib/common/mobile/ios/device/ios-application-manager.ts
@@ -4,7 +4,7 @@ import { ApplicationManagerBase } from "../../application-manager-base";
 import { cache } from "../../../decorators";
 
 export class IOSApplicationManager extends ApplicationManagerBase {
-	private applicationsLiveSyncInfos: Mobile.ILiveSyncApplicationInfo[];
+	private applicationsLiveSyncInfos: Mobile.IApplicationInfo[];
 
 	constructor(protected $logger: ILogger,
 		protected $hooksService: IHooksService,
@@ -18,7 +18,7 @@ export class IOSApplicationManager extends ApplicationManagerBase {
 	}
 
 	public async getInstalledApplications(): Promise<string[]> {
-		const applicationsLiveSyncStatus = await this.getApplicationsLiveSyncSupportedStatus();
+		const applicationsLiveSyncStatus = await this.getApplicationsInformation();
 
 		return _(applicationsLiveSyncStatus)
 			.map(appLiveSyncStatus => appLiveSyncStatus.applicationIdentifier)
@@ -33,39 +33,21 @@ export class IOSApplicationManager extends ApplicationManagerBase {
 		});
 	}
 
-	public async getApplicationInfo(applicationIdentifier: string): Promise<Mobile.IApplicationInfo> {
-		if (!this.applicationsLiveSyncInfos || !this.applicationsLiveSyncInfos.length) {
-			await this.getApplicationsLiveSyncSupportedStatus();
-		}
-
-		return _.find(this.applicationsLiveSyncInfos, app => app.applicationIdentifier === applicationIdentifier);
-	}
-
-	public async getApplicationsLiveSyncSupportedStatus(): Promise<Mobile.ILiveSyncApplicationInfo[]> {
+	public async getApplicationsInformation(): Promise<Mobile.IApplicationInfo[]> {
 		const deviceIdentifier = this.device.deviceInfo.identifier;
 		const applicationsOnDeviceInfo = _.first((await this.$iosDeviceOperations.apps([deviceIdentifier]))[deviceIdentifier]);
 		const applicationsOnDevice = applicationsOnDeviceInfo ? applicationsOnDeviceInfo.response : [];
-		this.$logger.trace("Result when getting applications for which LiveSync is enabled: ", JSON.stringify(applicationsOnDevice, null, 2));
+		this.$logger.trace("Result when getting applications information: ", JSON.stringify(applicationsOnDevice, null, 2));
 
 		this.applicationsLiveSyncInfos = _.map(applicationsOnDevice, app => ({
 			applicationIdentifier: app.CFBundleIdentifier,
-			isLiveSyncSupported: app.IceniumLiveSyncEnabled,
 			configuration: app.configuration,
 			deviceIdentifier: this.device.deviceInfo.identifier
 		}));
 
 		return this.applicationsLiveSyncInfos;
 	}
 
-	public async isLiveSyncSupported(appIdentifier: string): Promise<boolean> {
-		if (!this.applicationsLiveSyncInfos || !this.applicationsLiveSyncInfos.length) {
-			await this.getApplicationsLiveSyncSupportedStatus();
-		}
-
-		const selectedApplication = _.find(this.applicationsLiveSyncInfos, app => app.applicationIdentifier === appIdentifier);
-		return !!selectedApplication && selectedApplication.isLiveSyncSupported;
-	}
-
 	public async uninstallApplication(appIdentifier: string): Promise<void> {
 		await this.$iosDeviceOperations.uninstall(appIdentifier, [this.device.deviceInfo.identifier], (err: IOSDeviceLib.IDeviceError) => {
 			this.$logger.warn(`Failed to uninstall ${appIdentifier} on device with identifier ${err.deviceId}`);
diff --git a/lib/common/mobile/ios/ios-device-base.ts b/lib/common/mobile/ios/ios-device-base.ts
@@ -14,10 +14,6 @@ export abstract class IOSDeviceBase implements Mobile.IiOSDevice {
 	abstract isEmulator: boolean;
 	abstract openDeviceLogStream(options?: Mobile.IiOSLogStreamOptions): Promise<void>;
 
-	public getApplicationInfo(applicationIdentifier: string): Promise<Mobile.IApplicationInfo> {
-		return this.applicationManager.getApplicationInfo(applicationIdentifier);
-	}
-
 	@performanceLog()
 	public async getDebugSocket(appId: string, projectName: string): Promise<net.Socket> {
 		return this.$lockService.executeActionWithLock(async () => {
diff --git a/lib/common/mobile/ios/simulator/ios-simulator-application-manager.ts b/lib/common/mobile/ios/simulator/ios-simulator-application-manager.ts
@@ -15,7 +15,6 @@ export class IOSSimulatorApplicationManager extends ApplicationManagerBase {
 		private device: Mobile.IiOSDevice,
 		private $options: IOptions,
 		private $fs: IFileSystem,
-		private $plistParser: IPlistParser,
 		private $processService: IProcessService,
 		private $deviceLogProvider: Mobile.IDeviceLogProvider,
 		$logger: ILogger,
@@ -76,30 +75,6 @@ export class IOSSimulatorApplicationManager extends ApplicationManagerBase {
 		await this.iosSim.stopApplication(this.device.deviceInfo.identifier, appData.appId, appData.projectName);
 	}
 
-	public async getApplicationInfo(applicationIdentifier: string): Promise<Mobile.IApplicationInfo> {
-		let result: Mobile.IApplicationInfo = null;
-		const plistContent = await this.getParsedPlistContent(applicationIdentifier);
-
-		if (plistContent) {
-			result = {
-				applicationIdentifier,
-				deviceIdentifier: this.device.deviceInfo.identifier,
-				configuration: plistContent && plistContent.configuration
-			};
-		}
-
-		return result;
-	}
-
-	public async isLiveSyncSupported(appIdentifier: string): Promise<boolean> {
-		const plistContent = await this.getParsedPlistContent(appIdentifier);
-		if (plistContent) {
-			return !!plistContent && !!plistContent.IceniumLiveSyncEnabled;
-		}
-
-		return false;
-	}
-
 	public async getDebuggableApps(): Promise<Mobile.IDeviceApplicationInformation[]> {
 		return [];
 	}
@@ -139,17 +114,6 @@ export class IOSSimulatorApplicationManager extends ApplicationManagerBase {
 		}
 	}
 
-	private async getParsedPlistContent(appIdentifier: string): Promise<any> {
-		if (! await this.isApplicationInstalled(appIdentifier)) {
-			return null;
-		}
-
-		const applicationPath = await this.iosSim.getApplicationPath(this.device.deviceInfo.identifier, appIdentifier),
-			pathToInfoPlist = path.join(applicationPath, "Info.plist");
-
-		return this.$fs.exists(pathToInfoPlist) ? await this.$plistParser.parseFile(pathToInfoPlist) : null;
-	}
-
 	private async setDeviceLogData(appData: Mobile.IApplicationData, pid: string): Promise<void> {
 		this.$deviceLogProvider.setApplicationPidForDevice(this.device.deviceInfo.identifier, pid);
 		this.$deviceLogProvider.setProjectNameForDevice(this.device.deviceInfo.identifier, appData.projectName);
diff --git a/lib/common/mobile/mobile-core/devices-service.ts b/lib/common/mobile/mobile-core/devices-service.ts
@@ -794,22 +794,19 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 
 	private async isApplicationInstalledOnDevice(deviceIdentifier: string, appData: Mobile.IApplicationData): Promise<IAppInstalledInfo> {
 		let isInstalled = false;
-		let isLiveSyncSupported = false;
 		const device = this.getDeviceByIdentifier(deviceIdentifier);
 
 		try {
 			isInstalled = await device.applicationManager.isApplicationInstalled(appData.appId);
 			await device.applicationManager.tryStartApplication(appData);
-			isLiveSyncSupported = await isInstalled && !!device.applicationManager.isLiveSyncSupported(appData.appId);
 		} catch (err) {
 			this.$logger.trace("Error while checking is application installed. Error is: ", err);
 		}
 
 		return {
 			appIdentifier: appData.appId,
 			deviceIdentifier,
-			isInstalled,
-			isLiveSyncSupported
+			isInstalled
 		};
 	}
 
diff --git a/lib/common/test/unit-tests/mobile/android-device-file-system.ts b/lib/common/test/unit-tests/mobile/android-device-file-system.ts
@@ -108,7 +108,6 @@ function createDeviceAppData(androidVersion?: string): Mobile.IDeviceAppData {
 				version: androidVersion || "8.1.2"
 			}
 		},
-		isLiveSyncSupported: async () => true,
 		platform: "Android"
 	};
 }
diff --git a/lib/common/test/unit-tests/mobile/application-manager-base.ts b/lib/common/test/unit-tests/mobile/application-manager-base.ts
@@ -12,10 +12,6 @@ class ApplicationManager extends ApplicationManagerBase {
 		super($logger, $hooksService);
 	}
 
-	public async isLiveSyncSupported(appIdentifier: string): Promise<boolean> {
-		return true;
-	}
-
 	public async installApplication(packageFilePath: string): Promise<void> {
 		return;
 	}
@@ -36,10 +32,6 @@ class ApplicationManager extends ApplicationManagerBase {
 		return _.cloneDeep(currentlyInstalledApps);
 	}
 
-	public async getApplicationInfo(applicationIdentifier: string): Promise<Mobile.IApplicationInfo> {
-		return null;
-	}
-
 	public async getDebuggableApps(): Promise<Mobile.IDeviceApplicationInformation[]> {
 		return currentlyAvailableAppsForDebugging;
 	}
diff --git a/lib/common/test/unit-tests/mobile/devices-service.ts b/lib/common/test/unit-tests/mobile/devices-service.ts
diff --git a/lib/common/test/unit-tests/mobile/project-files-manager.ts b/lib/common/test/unit-tests/mobile/project-files-manager.ts
diff --git a/lib/services/livesync/platform-livesync-service-base.ts b/lib/services/livesync/platform-livesync-service-base.ts
diff --git a/test/services/livesync/android-device-livesync-service-base.ts b/test/services/livesync/android-device-livesync-service-base.ts

Original file line number	Diff line number	Diff line change
`@@ -76,14 +76,11 @@ export abstract class ApplicationManagerBase extends EventEmitter implements Mob`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`		`- public abstract async isLiveSyncSupported(appIdentifier: string): Promise<boolean>;`
`80`		`-`
`81`	`79`	`public abstract async installApplication(packageFilePath: string, appIdentifier?: string): Promise<void>;`
`82`	`80`	`public abstract async uninstallApplication(appIdentifier: string): Promise<void>;`
`83`	`81`	`public abstract async startApplication(appData: Mobile.IApplicationData): Promise<void>;`
`84`	`82`	`public abstract async stopApplication(appData: Mobile.IApplicationData): Promise<void>;`
`85`	`83`	`public abstract async getInstalledApplications(): Promise<string[]>;`
`86`		`- public abstract async getApplicationInfo(applicationIdentifier: string): Promise<Mobile.IApplicationInfo>;`
`87`	`84`	`public abstract async getDebuggableApps(): Promise<Mobile.IDeviceApplicationInformation[]>;`
`88`	`85`	`public abstract async getDebuggableAppViews(appIdentifiers: string[]): Promise<IDictionary<Mobile.IDebugWebViewInfo[]>>;`
`89`	`86`