From b5e2d21f33b9ca1addc94e45ccfde6ae9d70f305 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Tue, 5 Dec 2017 20:54:06 +0900 Subject: [PATCH] split to function send event conditions --- browser/main/lib/AwsMobileAnalyticsConfig.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/browser/main/lib/AwsMobileAnalyticsConfig.js b/browser/main/lib/AwsMobileAnalyticsConfig.js index 4a6c58ad..a19774f8 100644 --- a/browser/main/lib/AwsMobileAnalyticsConfig.js +++ b/browser/main/lib/AwsMobileAnalyticsConfig.js @@ -34,8 +34,15 @@ function convertPlatformName (platformName) { } } +function getSendEventCond () { + const isDev = process.env.NODE_ENV !== 'production' + const isDisable = !ConfigManager.default.get().amaEnabled + const isOffline = !window.navigator.onLine + return isDev || isDisable || isOffline +} + function initAwsMobileAnalytics () { - if (process.env.NODE_ENV !== 'production' || !ConfigManager.default.get().amaEnabled || !window.navigator.onLine) return + if (getSendEventCond()) return AWS.config.credentials.get((err) => { if (!err) { console.log('Cognito Identity ID: ' + AWS.config.credentials.identityId) @@ -46,7 +53,7 @@ function initAwsMobileAnalytics () { } function recordDynamicCustomEvent (type, options = {}) { - if (process.env.NODE_ENV !== 'production' || !ConfigManager.default.get().amaEnabled || !window.navigator.onLine) return + if (getSendEventCond()) return try { mobileAnalyticsClient.recordEvent(type, options) } catch (analyticsError) { @@ -57,7 +64,7 @@ function recordDynamicCustomEvent (type, options = {}) { } function recordStaticCustomEvent () { - if (process.env.NODE_ENV !== 'production' || !ConfigManager.default.get().amaEnabled || !window.navigator.onLine) return + if (getSendEventCond()) return try { mobileAnalyticsClient.recordEvent('UI_COLOR_THEME', { uiColorTheme: ConfigManager.default.get().ui.theme