Merge pull request #1857 from matrix-org/luke/fix-piwik-crash2

Fix Analytics to not import DEFAULTS, therefore avoiding NPE
matrix-org · Apr 26, 2018 · a17c6e1 · a17c6e1
2 parents fba1a0c + b1af4ec
commit a17c6e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/Analytics.js b/src/Analytics.js
@@ -16,7 +16,7 @@
 
 import { getCurrentLanguage, _t, _td } from './languageHandler';
 import PlatformPeg from './PlatformPeg';
-import SdkConfig, { DEFAULTS } from './SdkConfig';
+import SdkConfig from './SdkConfig';
 import Modal from './Modal';
 import sdk from './index';
 
@@ -199,8 +199,8 @@ class Analytics {
         const config = SdkConfig.get();
         if (!config.piwik) return;
 
-        const whitelistedHSUrls = config.piwik.whitelistedHSUrls || DEFAULTS.piwik.whitelistedHSUrls;
-        const whitelistedISUrls = config.piwik.whitelistedISUrls || DEFAULTS.piwik.whitelistedISUrls;
+        const whitelistedHSUrls = config.piwik.whitelistedHSUrls;
+        const whitelistedISUrls = config.piwik.whitelistedISUrls;
 
         this._setVisitVariable('User Type', isGuest ? 'Guest' : 'Logged In');
         this._setVisitVariable('Homeserver URL', whitelistRedact(whitelistedHSUrls, homeserverUrl));

diff --git a/src/SdkConfig.js b/src/SdkConfig.js
@@ -45,4 +45,3 @@ class SdkConfig {
 }
 
 module.exports = SdkConfig;
-module.exports.DEFAULTS = DEFAULTS;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,4 +45,3 @@ class SdkConfig {
		}

		module.exports = SdkConfig;
		module.exports.DEFAULTS = DEFAULTS;