Browse Source

fix: Fixes an error with configuration without analytics.

Fixes an error `Cannot convert undefined or null to object` on load.
master
Дамян Минков 4 years ago
parent
commit
fbf9d489f0

+ 4
- 4
react/features/base/conference/functions.js View File

234
     options.applicationName = getName();
234
     options.applicationName = getName();
235
     options.transcriptionLanguage = determineTranscriptionLanguage(options);
235
     options.transcriptionLanguage = determineTranscriptionLanguage(options);
236
 
236
 
237
-    // Disable analytics, if requessted.
237
+    // Disable analytics, if requested.
238
     if (options.disableThirdPartyRequests) {
238
     if (options.disableThirdPartyRequests) {
239
-        delete config.analytics.scriptURLs;
240
-        delete config.analytics.amplitudeAPPKey;
241
-        delete config.analytics.googleAnalyticsTrackingId;
239
+        delete config.analytics?.scriptURLs;
240
+        delete config.analytics?.amplitudeAPPKey;
241
+        delete config.analytics?.googleAnalyticsTrackingId;
242
         delete options.callStatsID;
242
         delete options.callStatsID;
243
         delete options.callStatsSecret;
243
         delete options.callStatsSecret;
244
     } else {
244
     } else {

+ 2
- 2
react/features/base/config/functions.native.js View File

15
 export function _cleanupConfig(config: Object) {
15
 export function _cleanupConfig(config: Object) {
16
     config.analytics.scriptURLs = [];
16
     config.analytics.scriptURLs = [];
17
     if (NativeModules.AppInfo.LIBRE_BUILD) {
17
     if (NativeModules.AppInfo.LIBRE_BUILD) {
18
-        delete config.analytics.amplitudeAPPKey;
19
-        delete config.analytics.googleAnalyticsTrackingId;
18
+        delete config.analytics?.amplitudeAPPKey;
19
+        delete config.analytics?.googleAnalyticsTrackingId;
20
         delete config.callStatsID;
20
         delete config.callStatsID;
21
         delete config.callStatsSecret;
21
         delete config.callStatsSecret;
22
     }
22
     }

Loading…
Cancel
Save