Merge pull request #952 from microsoft/release/update-sdk-demoapp

Update DemoApp for 4.4.3 SDK release

Author: AnatolyPristensky

DemoApp/android/app/src/main/java/com/demoapp/DemoAppNativeModule.java

@@ -9,10 +9,12 @@
 import android.os.Looper;
 import android.util.Log;
 
+import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.BaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.microsoft.appcenter.crashes.model.TestCrashException;
 import com.microsoft.appcenter.reactnative.shared.AppCenterReactNativeShared;
+import com.microsoft.appcenter.analytics.Analytics;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -34,6 +36,8 @@ public class DemoAppNativeModule extends BaseJavaModule {
 
     private native void nativeAllocateLargeBuffer();
 
+    private static final String MANUAL_SESSION_TRACKER_ENABLED_KEY = "manual_session_tracker_enabled";
+
     DemoAppNativeModule(Context context) {
         mSharedPreferences = context.getSharedPreferences(getName(), Context.MODE_PRIVATE);
     }
@@ -46,12 +50,32 @@ static void initSecrets(Context context) {
         AppCenterReactNativeShared.setStartAutomatically(startAutomaticallyOverride);
     }
 
+    static void initManualSessionTrackerState(Context context) {
+        SharedPreferences sharedPreferences = context.getSharedPreferences(DEMO_APP_NATIVE, Context.MODE_PRIVATE);
+        boolean isManualSessionTrackerEnabled = sharedPreferences.getBoolean(MANUAL_SESSION_TRACKER_ENABLED_KEY, false);
+        if (isManualSessionTrackerEnabled) {
+            Analytics.enableManualSessionTracker();
+        }
+    }
+
     @Override
     @Nonnull
     public String getName() {
         return DEMO_APP_NATIVE;
     }
 
+    @ReactMethod
+    public void saveManualSessionTrackerState(boolean state) {
+        mSharedPreferences.edit()
+                .putBoolean(MANUAL_SESSION_TRACKER_ENABLED_KEY, state)
+                .apply();
+    }
+
+    @ReactMethod
+    public void getManualSessionTrackerState(Promise promise) {
+        promise.resolve(mSharedPreferences.getBoolean(MANUAL_SESSION_TRACKER_ENABLED_KEY, false) ? 1 : 0);
+    }
+
     @SuppressWarnings("unused")
     @ReactMethod
     public void configureStartup(String secretString, boolean startAutomatically) {

DemoApp/android/app/src/main/java/com/demoapp/MainApplication.java

@@ -57,6 +57,7 @@ public ReactNativeHost getReactNativeHost() {
     public void onCreate() {
         super.onCreate();
         AppCenter.setLogLevel(Log.VERBOSE);
+        DemoAppNativeModule.initManualSessionTrackerState(this);
         DemoAppNativeModule.initSecrets(this);
         SoLoader.init(this, /* native exopackage */ false);
     }

DemoApp/app/screens/AnalyticsScreen.js

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 import React, { Component } from 'react';
-import { Image, View, Text, Switch, SectionList, TouchableOpacity } from 'react-native';
+import { Image, View, Text, Switch, SectionList, NativeModules, TouchableOpacity } from 'react-native';
 import Toast from 'react-native-simple-toast';
 
 import Analytics from 'appcenter-analytics';
@@ -25,10 +25,15 @@ export default class AnalyticsScreen extends Component {
   }
 
   state = {
-    analyticsEnabled: false
+    analyticsEnabled: false,
+    isManualSessionEnabled: false
   }
 
   async componentDidMount() {
+    NativeModules.DemoAppNative.getManualSessionTrackerState().then((isEnabled) => {
+      const isManualSessionEnabled = isEnabled === 1;
+      this.setState({ isManualSessionEnabled });
+    });
     await this.refreshToggle();
 
     this.props.navigation.setParams({
@@ -76,6 +81,15 @@ export default class AnalyticsScreen extends Component {
                     this.setState({ analyticsEnabled });
                   }
                 },
+                {
+                  title: 'Manual Session Tracking Enabled',
+                  value: 'isManualSessionEnabled',
+                  toggle: async () => {
+                    const isManualSessionEnabled = !this.state.isManualSessionEnabled;
+                    await NativeModules.DemoAppNative.saveManualSessionTrackerState(isManualSessionEnabled);
+                    this.setState({ isManualSessionEnabled });
+                  }
+                },
               ],
               renderItem: switchRenderItem
             },
@@ -106,6 +120,12 @@ export default class AnalyticsScreen extends Component {
                     showEventToast(eventName);
                   }
                 },
+                {
+                  title: 'Start session',
+                  action: () => {
+                    Analytics.startSession();
+                  }
+                },
               ],
               renderItem: actionRenderItem
             },

DemoApp/ios/DemoApp/AppDelegate.m

@@ -20,6 +20,7 @@
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTRootView.h>
 @import AppCenter;
+@import AppCenterAnalytics;
 
 @implementation AppDelegate
 
@@ -36,6 +37,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [AppCenterReactNativeShared setStartAutomatically:[startAutomatically boolValue]];
   }
 
+  BOOL sessionAuto = [[NSUserDefaults standardUserDefaults] boolForKey:@"ManualSessionTrackerEnabled"];
+  if (sessionAuto) {
+    [MSACAnalytics enableManualSessionTracker];
+  }
+
   [AppCenterReactNative register];                                   // Initialize AppCenter
   [AppCenterReactNativeAnalytics registerWithInitiallyEnabled:true]; // Initialize AppCenter Analytics
   [AppCenterReactNativeCrashes register];                            // Initialize AppCenter Crashes

DemoApp/ios/DemoApp/DemoAppNative.m

@@ -32,6 +32,7 @@ @implementation DemoAppNative
 static int const blockSize = 256 * 1024 * 1024;
 static NSString* const kAppCenterSecretKey = @"AppSecret";
 static NSString* const kAppCenterStartAutomaticallyKey = @"StartAutomatically";
+static NSString* const kManualSessionTrackerEnabled = @"ManualSessionTrackerEnabled";
 
 - (instancetype) init {
   self = [super init];
@@ -55,6 +56,21 @@ - (instancetype) init {
   [userDefaults setBool:startAutomatically forKey:kAppCenterStartAutomaticallyKey];
 }
 
+RCT_EXPORT_METHOD(saveManualSessionTrackerState:(BOOL)state)
+ {
+   NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+   [userDefaults setBool:state forKey:kManualSessionTrackerEnabled];
+ }
+
+RCT_EXPORT_METHOD(getManualSessionTrackerState:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+{
+  if ([[NSUserDefaults standardUserDefaults] boolForKey:kManualSessionTrackerEnabled]){
+    resolve(@(1));
+  } else {
+    resolve(@(0));
+  }
+}
+
 RCT_EXPORT_METHOD(generateTestCrash)
 {
   int* p = 0;

DemoApp/ios/Podfile

@@ -6,9 +6,9 @@ target 'DemoApp' do
   # use_frameworks!
 
   # Pods for DemoApp
-  pod 'AppCenter/Crashes', '~> 4.3.0'
-  pod 'AppCenter/Analytics', '~> 4.3.0'
-  pod 'AppCenterReactNativeShared', '~> 4.3.0'
+  pod 'AppCenter/Crashes', '~> 4.4.1'
+  pod 'AppCenter/Analytics', '~> 4.4.1'
+  pod 'AppCenterReactNativeShared', '~> 4.4.1'
 
   platform :ios, '9.0'
 

DemoApp/ios/Podfile.lock

@@ -1,26 +1,26 @@
 PODS:
-  - AppCenter/Analytics (4.3.0):
+  - AppCenter/Analytics (4.4.1):
     - AppCenter/Core
-  - AppCenter/Core (4.3.0)
-  - AppCenter/Crashes (4.3.0):
+  - AppCenter/Core (4.4.1)
+  - AppCenter/Crashes (4.4.1):
     - AppCenter/Core
-  - AppCenterReactNativeShared (4.3.0):
-    - AppCenter/Core (= 4.3.0)
+  - AppCenterReactNativeShared (4.4.3):
+    - AppCenter/Core (= 4.4.1)
 
 DEPENDENCIES:
-  - AppCenter/Analytics (~> 4.3.0)
-  - AppCenter/Crashes (~> 4.3.0)
-  - AppCenterReactNativeShared (~> 4.3.0)
+  - AppCenter/Analytics (~> 4.4.1)
+  - AppCenter/Crashes (~> 4.4.1)
+  - AppCenterReactNativeShared (~> 4.4.1)
 
 SPEC REPOS:
   https://msmobilecenter.visualstudio.com/SDK/_git/AppCenterSDK-Specs-Private:
     - AppCenter
     - AppCenterReactNativeShared
 
 SPEC CHECKSUMS:
-  AppCenter: 1fde01d939ee7c09bc2ff982476d1a891719065c
-  AppCenterReactNativeShared: b150ce9f33c10395798b2a60aed2e114acd87557
+  AppCenter: f972fab2a9b76ab4774a96a8535e5a4dec2e525d
+  AppCenterReactNativeShared: 63c1d3d91630c2d0f7d753c36bfcd7aaf681a960
 
-PODFILE CHECKSUM: 68158a0223388bbed08e7c1ba598db31fccc7cea
+PODFILE CHECKSUM: 13e9d546ca535513259acce190bfc0697d10ba42
 
 COCOAPODS: 1.11.0

DemoApp/package.json

@@ -9,9 +9,9 @@
   },
   "dependencies": {
     "@react-native-community/async-storage": "1.6.2",
-    "appcenter": "^4.3.0",
-    "appcenter-analytics": "^4.3.0",
-    "appcenter-crashes": "^4.3.0",
+    "appcenter": "^4.4.3",
+    "appcenter-analytics": "^4.4.3",
+    "appcenter-crashes": "^4.4.3",
     "metro": "0.54.1",
     "react": "16.8.3",
     "react-native": "0.59.9",
@@ -25,7 +25,7 @@
     "stacktrace-parser": "0.1.7"
   },
   "devDependencies": {
-    "@babel/core": "7.6.4",
+    "@babel/core": "^7.16.7",
     "@babel/plugin-external-helpers": "7.2.0",
     "@babel/runtime": "7.6.3",
     "@react-native-community/eslint-config": "0.0.3",
@@ -37,7 +37,7 @@
     "eslint-plugin-jsx-a11y": "6.2.3",
     "eslint-plugin-react": "7.16.0",
     "jest": "24.9.0",
-    "metro-react-native-babel-preset": "0.54.1",
+    "metro-react-native-babel-preset": "^0.66.2",
     "react-test-renderer": "16.8.3"
   },
   "jest": {