react-native-mparticle 2.7.7 → 2.7.9

package/android/libs/react-native-android/com/facebook/react/react-native/0.70.5/react-native-0.70.5.pom

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- This module was also published with a richer model, Gradle metadata,  -->
+  <!-- which should be used instead. Do not delete the following line which  -->
+  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
+  <!-- that they should prefer consuming it instead. -->
+  <!-- do_not_remove: published-with-gradle-metadata -->
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.facebook.react</groupId>
+  <artifactId>react-native</artifactId>
+  <version>0.70.5</version>
+  <packaging>pom</packaging>
+  <name>ReactNative</name>
+  <description>A framework for building native apps with React</description>
+  <url>https://github.com/facebook/react-native</url>
+  <licenses>
+    <license>
+      <name>MIT License</name>
+      <url>https://github.com/facebook/react-native/blob/HEAD/LICENSE</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>facebook</id>
+      <name>Facebook</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:https://github.com/facebook/react-native.git</connection>
+    <developerConnection>scm:git:git@github.com:facebook/react-native.git</developerConnection>
+    <url>https://github.com/facebook/react-native.git</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>androidx.appcompat</groupId>
+      <artifactId>appcompat-resources</artifactId>
+      <version>1.4.1</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>androidx.appcompat</groupId>
+      <artifactId>appcompat</artifactId>
+      <version>1.4.1</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>androidx.autofill</groupId>
+      <artifactId>autofill</artifactId>
+      <version>1.1.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>androidx.swiperefreshlayout</groupId>
+      <artifactId>swiperefreshlayout</artifactId>
+      <version>1.0.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.facebook.fbjni</groupId>
+      <artifactId>fbjni-java-only</artifactId>
+      <version>0.2.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.facebook.fresco</groupId>
+      <artifactId>fresco</artifactId>
+      <version>2.5.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.facebook.fresco</groupId>
+      <artifactId>imagepipeline-okhttp3</artifactId>
+      <version>2.5.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.facebook.fresco</groupId>
+      <artifactId>ui-common</artifactId>
+      <version>2.5.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.facebook.infer.annotation</groupId>
+      <artifactId>infer-annotation</artifactId>
+      <version>0.18.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.facebook.soloader</groupId>
+      <artifactId>soloader</artifactId>
+      <version>0.10.4</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.facebook.yoga</groupId>
+      <artifactId>proguard-annotations</artifactId>
+      <version>1.19.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>3.0.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp-urlconnection</artifactId>
+      <version>4.9.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp</artifactId>
+      <version>4.9.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okio</groupId>
+      <artifactId>okio</artifactId>
+      <version>2.9.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>1.6.10</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+</project>

package/android/libs/react-native-android/com/facebook/react/react-native/0.70.5/react-native-0.70.5.pom.md5

@@ -0,0 +1 @@
+314aca710fcde34076ae5994d7f9b97e

package/android/libs/react-native-android/com/facebook/react/react-native/0.70.5/react-native-0.70.5.pom.sha1

@@ -0,0 +1 @@
+6a163a1b47caaf40d6e1073ea5c7e12985e5039a

package/android/libs/react-native-android/com/facebook/react/react-native/0.70.5/react-native-0.70.5.pom.sha256

@@ -0,0 +1 @@
+801b36c31a6e9a37096d594bd2ab459c2506d6a25c8417e912a29af7b7d6507e

package/android/libs/react-native-android/com/facebook/react/react-native/0.70.5/react-native-0.70.5.pom.sha512

@@ -0,0 +1 @@
+2b7a31bf8d9b01bc8185de8a018e469e5eea59c311e4a1cd531004b016d2218ff0c683f1c4ad904d28248fa3b58d0c54384f9b19dfedb68e82ce3d226fa10b70

package/android/libs/react-native-android/com/facebook/react/react-native/maven-metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>com.facebook.react</groupId>
+  <artifactId>react-native</artifactId>
+  <versioning>
+    <latest>0.70.5</latest>
+    <release>0.70.5</release>
+    <versions>
+      <version>0.70.5</version>
+    </versions>
+    <lastUpdated>20221106211052</lastUpdated>
+  </versioning>
+</metadata>

package/android/libs/react-native-android/com/facebook/react/react-native/maven-metadata.xml.md5

@@ -0,0 +1 @@
+2fd397e2d08ed150f66851e1e34dd67e

package/android/libs/react-native-android/com/facebook/react/react-native/maven-metadata.xml.sha1

@@ -0,0 +1 @@
+d4efb834e0463c9149216b52f559ffbb81710ece

package/android/libs/react-native-android/com/facebook/react/react-native/maven-metadata.xml.sha256

@@ -0,0 +1 @@
+e3a583f456c35a1bd17a05d4627fec2fa5c7d80ea095f5d6d24c13b98b341453

package/android/libs/react-native-android/com/facebook/react/react-native/maven-metadata.xml.sha512

@@ -0,0 +1 @@
+4b9cfbc4aed81b138b7942f7488f450c4475d60f0d352f9e67b54e38879873e7f78ee744835d46be66ba32925244d4916add618897b45180381fb95bb8082cd6

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

@@ -19,6 +19,7 @@ import com.mparticle.AttributionResult;
 import com.mparticle.MParticle;
 import com.mparticle.MPEvent;
 import com.mparticle.Session;
+import com.mparticle.UserAttributeListenerType;
 import com.mparticle.commerce.CommerceEvent;
 import com.mparticle.commerce.Impression;
 import com.mparticle.commerce.Product;
@@ -62,6 +63,16 @@ public class MParticleModule extends ReactContextBaseJavaModule {
         return "MParticle";
     }
 
+    @ReactMethod
+    public void upload() {
+        MParticle.getInstance().upload();
+    }
+
+    @ReactMethod
+    public void setUploadInterval(int uploadInterval) {
+        MParticle.getInstance().setUpdateInterval(uploadInterval);
+    }
+
     @ReactMethod
     public void logEvent(final String name, int type, final ReadableMap attributesMap) {
         Map<String, String> attributes = ConvertStringMap(attributesMap);
@@ -824,6 +835,10 @@ public class MParticleModule extends ReactContextBaseJavaModule {
                 return MParticle.EventType.UserPreference;
             case 7:
                 return MParticle.EventType.Social;
+            case 8:
+                return MParticle.EventType.Other;
+            case 9:
+                return MParticle.EventType.Media;
             default:
                 return MParticle.EventType.Other;
         }
@@ -876,7 +891,7 @@ public class MParticleModule extends ReactContextBaseJavaModule {
     }
 
     @Nullable
-    private GDPRConsent ConvertToGDPRConsent(ReadableMap map ) {
+    private GDPRConsent ConvertToGDPRConsent(ReadableMap map) {
         Boolean consented;
         try {
             if (map.getType("consented").equals(ReadableType.Boolean)) {

package/android/src/test/java/com/mparticle/react/IdentityApiTest.java

@@ -1,6 +1,6 @@
 package com.mparticle.react;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -17,8 +17,11 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.Random;
 
@@ -26,15 +29,17 @@ import static junit.framework.TestCase.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+@RunWith(MockitoJUnitRunner.class)
 public class IdentityApiTest {
     MParticleModule identityApi;
     Random random = new Random();
 
     @Before
     public void before() {
+        MockitoAnnotations.openMocks(this);
         MParticle.setInstance(Mockito.mock(MParticle.class));
         Mockito.when(MParticle.getInstance().Identity()).thenReturn(Mockito.mock(IdentityApi.class));
-        Mockito.when(MParticle.getInstance().Identity().getUser(null)).thenReturn(null);
+        Mockito.lenient().when(MParticle.getInstance().Identity().getUser(0L)).thenReturn(null);
         identityApi = new MParticleModule(Mockito.mock(ReactApplicationContext.class));
     }
 
@@ -127,7 +132,7 @@ public class IdentityApiTest {
         MParticleUser destinationUser = Mockito.mock(MParticleUser.class);
         Mockito.when(destinationUser.getId()).thenReturn(2L);
 
-        Mockito.when(MParticle.getInstance().Identity().getUser(1l)).thenReturn(sourceUser);
+        Mockito.when(MParticle.getInstance().Identity().getUser(1L)).thenReturn(sourceUser);
         Mockito.when(MParticle.getInstance().Identity().getUser(2L)).thenReturn(destinationUser);
 
         Mockito.when(MParticle.getInstance().Identity().aliasUsers(Mockito.any(AliasRequest.class))).thenReturn(true);
@@ -173,7 +178,7 @@ public class IdentityApiTest {
 
         identityApi.aliasUsers(new MockMap(aliasJson), callback);
 
-        Mockito.when(MParticle.getInstance().Identity().aliasUsers(Mockito.any(AliasRequest.class))).thenThrow(new RuntimeException("aliasUsers() should not be called"));
+        Mockito.lenient().when(MParticle.getInstance().Identity().aliasUsers(Mockito.any(AliasRequest.class))).thenThrow(new RuntimeException("aliasUsers() should not be called"));
         assertEquals(2, callbackResult.value.length);
         assertEquals(false, callbackResult.value[0]);
         assertTrue(((String)callbackResult.value[1]).length() > 5);
@@ -185,7 +190,7 @@ public class IdentityApiTest {
 
         identityApi.aliasUsers(new MockMap(aliasJson), callback);
 
-        Mockito.when(MParticle.getInstance().Identity().aliasUsers(Mockito.any(AliasRequest.class))).thenThrow(new RuntimeException("aliasUsers() should not be called"));
+        Mockito.lenient().when(MParticle.getInstance().Identity().aliasUsers(Mockito.any(AliasRequest.class))).thenThrow(new RuntimeException("aliasUsers() should not be called"));
         assertEquals(2, callbackResult.value.length);
         assertEquals(false, callbackResult.value[0]);
         assertTrue(((String)callbackResult.value[1]).length() > 5);
@@ -222,6 +227,4 @@ public class IdentityApiTest {
         assertEquals(3, aliasCaptor.getValue().getStartTime());
         assertEquals(4, aliasCaptor.getValue().getEndTime());
     }
-
-
 }

package/android/src/test/java/com/mparticle/react/MParticleUserTest.java

@@ -1,6 +1,6 @@
 package com.mparticle.react;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -15,7 +15,10 @@ import com.mparticle.react.testutils.Mutable;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,15 +29,17 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+@RunWith(MockitoJUnitRunner.class)
 public class MParticleUserTest {
     MParticleModule mParticleUser;
     Random random = new Random();
 
     @Before
     public void before() {
+        MockitoAnnotations.openMocks(this);
         MParticle.setInstance(Mockito.mock(MParticle.class));
         Mockito.when(MParticle.getInstance().Identity()).thenReturn(Mockito.mock(IdentityApi.class));
-        Mockito.when(MParticle.getInstance().Identity().getUser(null)).thenReturn(null);
+        Mockito.lenient().when(MParticle.getInstance().Identity().getUser(0L)).thenReturn(null);
         mParticleUser = new MParticleModule(Mockito.mock(ReactApplicationContext.class)) {
             @Override
             public WritableMap getWritableMap() {

package/android/src/test/java/com/mparticle/react/testutils/MockMParticleUser.java

@@ -1,7 +1,7 @@
 package com.mparticle.react.testutils;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.mparticle.MParticle;
 import com.mparticle.UserAttributeListener;

package/ios/RNMParticle/RNMParticle.m

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

package/js/index.js

@@ -12,7 +12,8 @@ const EventType = {
   UserContent: 5,
   UserPreference: 6,
   Social: 7,
-  Other: 8
+  Other: 8,
+  Media: 9
 }
 
 const UserAttributeType = {
@@ -84,6 +85,14 @@ const ATTAuthStatus = {
 
 // ******** Main API ********
 
+const upload = () => {
+  NativeModules.MParticle.upload()
+}
+
+const setUploadInterval = (uploadInterval) => {
+  NativeModules.MParticle.setUploadInterval(uploadInterval)
+}
+
 const logEvent = (eventName, type = EventType.Other, attributes = null) => {
   NativeModules.MParticle.logEvent(eventName, type, attributes)
 }
@@ -660,7 +669,9 @@ const MParticle = {
   GDPRConsent,
   CCPAConsent,
 
-  logEvent,             // Methods
+  upload,             // Methods
+  setUploadInterval,
+  logEvent,
   logMPEvent,
   logCommerceEvent,
   logScreenEvent,

package/package.json

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