Merge pull request #117 from Microsoft/fix/analytics-setenabled-bug

Fix a bug where Analytics is always enabled even Analytics is set to "Enable in JavaScript"
microsoft · Sep 18, 2017 · c9af69c · c9af69c
2 parents 52dfce4 + e50adb4
commit c9af69c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/...s/android/src/main/java/com/microsoft/azure/mobile/react/analytics/RNAnalyticsModule.java b/...s/android/src/main/java/com/microsoft/azure/mobile/react/analytics/RNAnalyticsModule.java
@@ -18,14 +18,11 @@ public class RNAnalyticsModule extends BaseJavaModule {
 
     public RNAnalyticsModule(Application application, boolean startEnabled) {
         RNMobileCenterShared.configureMobileCenter(application);
+        MobileCenter.start(Analytics.class);
         if (!startEnabled) {
-            // Avoid starting an analytics session.
-            // Note that we don't call this if startEnabled is true, because
-            // that causes a session to try and start before Analytics is started.
             Analytics.setEnabled(false);
         }
         //Analytics.setAutoPageTrackingEnabled(false); // TODO: once the underlying SDK supports this, make sure to call this
-        MobileCenter.start(Analytics.class);
     }
 
     @Override

diff --git a/mobile-center-analytics/ios/RNAnalytics/RNAnalytics.m b/mobile-center-analytics/ios/RNAnalytics/RNAnalytics.m
@@ -31,14 +31,11 @@ @implementation RNAnalytics
 + (void)registerWithInitiallyEnabled:(BOOL) enabled
 {
     [RNMobileCenterShared configureMobileCenter];
+    [MSMobileCenter startService:[MSAnalytics class]];
     if (!enabled) {
-        // Avoid starting an analytics session.
-        // Note that we don't call this if startEnabled is true, because
-        // that causes a session to try and start before MSAnalytics is started.
         [MSAnalytics setEnabled:enabled];
     }
     //[MSAnalytics setAutoPageTrackingEnabled:false]; // TODO: once the underlying SDK supports this, make sure to call this
-    [MSMobileCenter startService:[MSAnalytics class]];
 }
 
 RCT_EXPORT_METHOD(isEnabled:(RCTPromiseResolveBlock)resolve