Merge pull request #1914 from NativeScript/milanov/move-analytics-service-registration

Move analytics service registration

Author: enchev

lib/bootstrap.ts

@@ -25,6 +25,7 @@ $injector.require("androidDebugService", "./services/android-debug-service");
 
 $injector.require("userSettingsService", "./services/user-settings-service");
 $injector.require("analyticsSettingsService", "./services/analytics-settings-service");
+$injector.require("analyticsService", "./services/analytics-service");
 
 $injector.require("emulatorSettingsService", "./services/emulator-settings-service");
 

lib/common

@@ -25,7 +25,6 @@ export class StaticConfig extends StaticConfigBase implements IStaticConfig {
 	public CLIENT_NAME = "tns";
 	public CLIENT_NAME_ALIAS = "NativeScript";
 	public ANALYTICS_API_KEY = "5752dabccfc54c4ab82aea9626b7338e";
-	public ANALYTICS_FEATURE_USAGE_TRACKING_API_KEY = "9912cff308334c6d9ad9c33f76a983e3";
 	public TRACK_FEATURE_USAGE_SETTING_NAME = "TrackFeatureUsage";
 	public ERROR_REPORT_SETTING_NAME = "TrackExceptions";
 	public ANALYTICS_INSTALLATION_ID_SETTING_NAME = "AnalyticsInstallationID";

lib/config.ts

@@ -0,0 +1,28 @@
+import {AnalyticsServiceBase} from "../common/services/analytics-service-base";
+
+export class AnalyticsService extends AnalyticsServiceBase implements IAnalyticsService {
+	private static ANALYTICS_FEATURE_USAGE_TRACKING_API_KEY = "9912cff308334c6d9ad9c33f76a983e3";
+
+	constructor(protected $logger: ILogger,
+		protected $options: IOptions,
+		$staticConfig: Config.IStaticConfig,
+		$errors: IErrors,
+		$prompter: IPrompter,
+		$userSettingsService: UserSettings.IUserSettingsService,
+		$analyticsSettingsService: IAnalyticsSettingsService,
+		$progressIndicator: IProgressIndicator) {
+		super($logger, $options, $staticConfig, $errors, $prompter, $userSettingsService, $analyticsSettingsService, $progressIndicator);
+	}
+
+	protected checkConsentCore(trackFeatureUsage: boolean): IFuture<void> {
+		return (() => {
+			this.restartEqatecMonitor(AnalyticsService.ANALYTICS_FEATURE_USAGE_TRACKING_API_KEY).wait();
+			super.checkConsentCore(trackFeatureUsage).wait();
+
+			// Stop the monitor, so correct API_KEY will be used when features are tracked.
+			this.tryStopEqatecMonitor();
+		}).future<void>()();
+	}
+}
+
+$injector.register("analyticsService", AnalyticsService);