react-native-mparticle 2.6.2 → 2.7.1-patch.1

package/.github/workflows/pull-request.yml

@@ -0,0 +1,31 @@
+name: "Build and Test"
+
+on: [pull_request, push]
+
+jobs:
+    js-tests:
+      name: "JS Tests"
+      runs-on: macOS-latest
+      steps:
+      - name: "Checkout"
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@master
+      - uses: c-hive/gha-yarn-cache@v1
+
+      - name: "Install node modules"
+        run: |
+          yarn install
+          
+      - name: "Run test"
+        run: |
+          yarn test
+    android-unit-tests:
+      name: "Android Unit Tests"
+      runs-on: ubuntu-18.04
+      steps:
+          - name: "Checkout"
+            uses: actions/checkout@v2
+          
+          - name: "Run Android Unit Tests"
+            working-directory: android
+            run: ./gradlew test

package/README.md

@@ -61,24 +61,23 @@ import mParticle_Apple_SDK
 
 func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         
-       // Override point for customization after application launch.
+        //override point for customization after application launch.
         let mParticleOptions = MParticleOptions(key: "<<<App Key Here>>>", secret: "<<<App Secret Here>>>")
         
-       //Please see the Identity page for more information on building this object
+        //optional- Please see the Identity page for more information on building this object
         let request = MPIdentityApiRequest()
         request.email = "email@example.com"
         mParticleOptions.identifyRequest = request
+        //optional
         mParticleOptions.onIdentifyComplete = { (apiResult, error) in
             NSLog("Identify complete. userId = %@ error = %@", apiResult?.user.userId.stringValue ?? "Null User ID", error?.localizedDescription ?? "No Error Available")
         }
+        //optional
         mParticleOptions.onAttributionComplete = { (attributionResult, error) in
                     NSLog(@"Attribution Complete. attributionResults = %@", attributionResult.linkInfo)
         }
-        
-       //Start the SDK
-        MParticle.sharedInstance().start(with: mParticleOptions)
-        
-       return true
+        MParticle.sharedInstance().start(with: mParticleOptions)        
+        return true
 }
 ```
 
@@ -110,13 +109,15 @@ Next, you'll need to start the SDK:
     MParticleOptions *mParticleOptions = [MParticleOptions optionsWithKey:@"REPLACE ME"
                                                                    secret:@"REPLACE ME"];
     
-    //Please see the Identity page for more information on building this object
+    //optional - Please see the Identity page for more information on building this object
     MPIdentityApiRequest *request = [MPIdentityApiRequest requestWithEmptyUser];
     request.email = @"email@example.com";
     mParticleOptions.identifyRequest = request;
+    //optional
     mParticleOptions.onIdentifyComplete = ^(MPIdentityApiResult * _Nullable apiResult, NSError * _Nullable error) {
         NSLog(@"Identify complete. userId = %@ error = %@", apiResult.user.userId, error);
     };
+    //optional
     mParticleOptions.onAttributionComplete(MPAttributionResult * _Nullable attributionResult, NSError * _Nullable error) {
         NSLog(@"Attribution Complete. attributionResults = %@", attributionResult.linkInfo)
     }
@@ -138,29 +139,31 @@ See [Identity](http://docs.mparticle.com/developers/sdk/ios/identity/) for more
 
 For more help, see [the Android set up docs](https://docs.mparticle.com/developers/sdk/android/getting-started/#create-an-input).
 
-```java
+```kotlin
 package com.example.myapp;
 
 import android.app.Application;
 import com.mparticle.MParticle;
 
-public class MyApplication extends Application {
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        MParticleOptions options = MParticleOptions.builder(this)
-            .credentials("REPLACE ME WITH KEY","REPLACE ME WITH SECRET")
-            .setLogLevel(MParticle.LogLevel.VERBOSE)
+class MyApplication : Application() {
+    fun onCreate() {
+        super.onCreate()
+        val options: MParticleOptions = MParticleOptions.builder(this)
+            .credentials("REPLACE ME WITH KEY", "REPLACE ME WITH SECRET")
+            //optional
+            .logLevel(MParticle.LogLevel.VERBOSE)
+            //optional
             .identify(identifyRequest)
+            //optional
             .identifyTask(
-                new BaseIdentityTask()
-                        .addFailureListener(this)
-                        .addSuccessListener(this)
-                    )
+                BaseIdentityTask()
+                    .addFailureListener { errorResponse -> }
+                    .addSuccessListener{ result -> }
+            )
+            //optional
             .attributionListener(this)
-            .build();
-
-        MParticle.start(options);
+            .build()
+        MParticle.start(options)
     }
 }
 ```

package/android/.project

@@ -22,12 +22,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1630678802180</id>
+			<id>1669992816070</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,4 +1,4 @@
-arguments=
+arguments=--init-script /var/folders/g2/z0qqdq651r90nx1z1l28fpj1wbw2yx/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/g2/z0qqdq651r90nx1z1l28fpj1wbw2yx/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
 auto.sync=false
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)

package/android/src/main/java/com/mparticle/react/MParticleModule.java

@@ -13,6 +13,8 @@ import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableNativeArray;
 import com.mparticle.AttributionResult;
 import com.mparticle.MParticle;
 import com.mparticle.MPEvent;
@@ -60,13 +62,18 @@ public class MParticleModule extends ReactContextBaseJavaModule {
         return "MParticle";
     }
 
+    @ReactMethod
+    public void upload() {
+        MParticle.getInstance().upload();
+    }
+
     @ReactMethod
     public void logEvent(final String name, int type, final ReadableMap attributesMap) {
         Map<String, String> attributes = ConvertStringMap(attributesMap);
         MParticle.EventType eventType = ConvertEventType(type);
 
         MPEvent event = new MPEvent.Builder(name, eventType)
-                .info(attributes)
+                .customAttributes(attributes)
                 .build();
         MParticle.getInstance().logEvent(event);
     }
@@ -121,7 +128,19 @@ public class MParticleModule extends ReactContextBaseJavaModule {
             selectedUser.getUserAttributes(new UserAttributeListener() {
                 @Override
                 public void onUserAttributesReceived(Map<String, String> userAttributes, Map<String, List<String>> userAttributeLists, Long mpid) {
-                    completion.invoke(null, userAttributes);
+                    WritableMap resultMap = new WritableNativeMap();
+                    for (Map.Entry<String, String> entry : userAttributes.entrySet()) {
+                        resultMap.putString(entry.getKey(), entry.getValue());
+                    }
+                    for (Map.Entry<String, List<String>> entry : userAttributeLists.entrySet()) {
+                        WritableArray resultArray = new WritableNativeArray();
+                        List<String> valueList = entry.getValue();
+                        for (String arrayVal : valueList) {
+                            resultArray.pushString(arrayVal);
+                        }
+                        resultMap.putArray(entry.getKey(), resultArray);
+                    }
+                    completion.invoke(null, resultMap);
                 }
             });
         } else {
@@ -496,7 +515,7 @@ public class MParticleModule extends ReactContextBaseJavaModule {
             if (map.hasKey("info")) {
                 ReadableMap customInfoMap = map.getMap("info");
                 Map<String, String> customInfo = ConvertStringMap(customInfoMap);
-                builder.info(customInfo);
+                builder.customAttributes(customInfo);
             }
 
             if (map.hasKey("customFlags")) {

package/ios/RNMParticle/RNMParticle.m

@@ -19,6 +19,11 @@ RCT_EXTERN void RCTRegisterModule(Class);
     RCTRegisterModule(self);
 }
 
+RCT_EXPORT_METHOD(upload)
+{
+    [[MParticle sharedInstance] upload];
+}
+
 RCT_EXPORT_METHOD(logEvent:(NSString *)eventName type:(NSInteger)type attributes:(NSDictionary *)attributes)
 {
     [[MParticle sharedInstance] logEvent:eventName eventType:type eventInfo:attributes];

package/js/index.js

@@ -84,6 +84,10 @@ const ATTAuthStatus = {
 
 // ******** Main API ********
 
+const upload = () => {
+  NativeModules.MParticle.upload()
+}
+
 const logEvent = (eventName, type = EventType.Other, attributes = null) => {
   NativeModules.MParticle.logEvent(eventName, type, attributes)
 }
@@ -660,6 +664,7 @@ const MParticle = {
   GDPRConsent,
   CCPAConsent,
 
+  upload,
   logEvent,             // Methods
   logMPEvent,
   logCommerceEvent,

package/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://www.mparticle.com",
   "license": "Apache-2.0",
   "repository": "mParticle/react-native-mparticle",
-  "version": "2.6.2",
+  "version": "2.7.1-patch.1",
   "main": "js/index.js",
   "scripts": {
     "test": "./node_modules/standard/bin/cmd.js",

package/.github/workflows/react-ci.yml

@@ -1,22 +0,0 @@
-name: Continuous Integration
-
-on:
-  pull_request:
-  push:
-
-jobs:
-  build:
-    runs-on: macOS-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - uses: actions/setup-node@master
-    - uses: c-hive/gha-yarn-cache@v1
-
-    - name: Install node modules
-      run: |
-        yarn install
-        
-    - name: Run test
-      run: |
-        yarn test