PR Comments 2

rosen-vladimirov · rosen-vladimirov · commit df53c2aa7ddd · 2017-09-05T11:38:35.000+03:00
diff --git a/lib/bootstrap.ts b/lib/bootstrap.ts
@@ -30,7 +30,7 @@ $injector.require("androidDebugService", "./services/android-debug-service");
 
 $injector.require("userSettingsService", "./services/user-settings-service");
 $injector.require("analyticsSettingsService", "./services/analytics-settings-service");
-$injector.requirePublic("analyticsService", "./services/analytics/analytics-service");
+$injector.require("analyticsService", "./services/analytics/analytics-service");
 $injector.require("eqatecAnalyticsProvider", "./services/analytics/eqatec-analytics-provider");
 $injector.require("googleAnalyticsProvider", "./services/analytics/google-analytics-provider");
 
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit c7fd67a16734edbbf8c1a1d0cc32587441c136e5
+Subproject commit 7072607b66f0394699b6bb36a5c66f366f3965fa
diff --git a/lib/services/analytics/analytics-service.ts b/lib/services/analytics/analytics-service.ts
@@ -23,11 +23,23 @@ export class AnalyticsService extends AnalyticsServiceBase implements IAnalytics
 	}
 
 	public track(featureName: string, featureValue: string): Promise<void> {
-		return this.sendDataForTracking(featureName, featureValue);
+		const data: IFeatureTrackingInformation = {
+			type: TrackingTypes.Feature,
+			featureName: featureName,
+			featureValue: featureValue
+		};
+
+		return this.sendInfoForTracking(data, this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME);
 	}
 
 	public trackException(exception: any, message: string): Promise<void> {
-		return this.sendExceptionForTracking(exception, message);
+		const data: IExceptionsTrackingInformation = {
+			type: TrackingTypes.Exception,
+			exception,
+			message
+		};
+
+		return this.sendInfoForTracking(data, this.$staticConfig.ERROR_REPORT_SETTING_NAME);
 	}
 
 	public async trackAcceptFeatureUsage(settings: { acceptTrackFeatureUsage: boolean }): Promise<void> {
@@ -137,44 +149,25 @@ export class AnalyticsService extends AnalyticsServiceBase implements IAnalytics
 
 					if (!isSettled) {
 						isSettled = true;
+
+						this.$processService.attachToProcessExitSignals(this, () => {
+							broker.send({
+								type: TrackingTypes.Finish
+							});
+						});
+
 						resolve(broker);
 					}
 				}
 			});
-
-			this.$processService.attachToProcessExitSignals(this, () => {
-				broker.send({
-					type: TrackingTypes.Finish
-				});
-			});
 		});
 	}
 
-	private async sendDataForTracking(featureName: string, featureValue: string): Promise<void> {
-		await this.initAnalyticsStatuses();
-
-		if (!this.$staticConfig.disableAnalytics && this.analyticsStatuses[this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME] === AnalyticsStatus.enabled) {
-			return this.sendMessageToBroker(
-				<IFeatureTrackingInformation>{
-					type: TrackingTypes.Feature,
-					featureName: featureName,
-					featureValue: featureValue
-				}
-			);
-		}
-	}
-
-	private async sendExceptionForTracking(exception: Error, message: string): Promise<void> {
+	private async sendInfoForTracking(trackingInfo: ITrackingInformation, settingName: string): Promise<void> {
 		await this.initAnalyticsStatuses();
 
-		if (!this.$staticConfig.disableAnalytics && this.analyticsStatuses[this.$staticConfig.ERROR_REPORT_SETTING_NAME] === AnalyticsStatus.enabled) {
-			return this.sendMessageToBroker(
-				<IExceptionsTrackingInformation>{
-					type: TrackingTypes.Exception,
-					exception,
-					message
-				}
-			);
+		if (!this.$staticConfig.disableAnalytics && this.analyticsStatuses[settingName] === AnalyticsStatus.enabled) {
+			return this.sendMessageToBroker(trackingInfo);
 		}
 	}
 
diff --git a/lib/services/analytics/google-analytics-provider.ts b/lib/services/analytics/google-analytics-provider.ts
@@ -3,7 +3,7 @@ import * as ua from "universal-analytics";
 import { AnalyticsClients } from "../../common/constants";
 
 export class GoogleAnalyticsProvider implements IGoogleAnalyticsProvider {
-	private static GA_TRACKING_ID = "UA-105322832-1"; // "UA-111455-44";
+	private static GA_TRACKING_ID = "UA-111455-44";
 	private currentPage: string;
 
 	constructor(private clientId: string,
