@appmetrica/react-native-analytics 3.0.0 → 3.2.0

package/android/build.gradle

@@ -85,5 +85,5 @@ dependencies {
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
-  implementation "io.appmetrica.analytics:analytics:6.5.0"
+  implementation "io.appmetrica.analytics:analytics:7.2.0"
 }

package/android/src/main/java/io/appmetrica/analytics/reactnative/AppMetricaModule.java

@@ -11,6 +11,7 @@ import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.module.annotations.ReactModule;
+
 import io.appmetrica.analytics.AppMetrica;
 import io.appmetrica.analytics.AppMetricaConfig;
 import io.appmetrica.analytics.ecommerce.ECommerceEvent;
@@ -39,7 +40,7 @@ public class AppMetricaModule extends ReactContextBaseJavaModule {
     public void activate(ReadableMap configMap) {
         AppMetricaConfig config = Utils.toAppMetricaConfig(configMap);
         AppMetrica.activate(reactContext, config);
-        if (Boolean.TRUE.equals(config.sessionsAutoTrackingEnabled)) {
+        if (!Boolean.FALSE.equals(config.sessionsAutoTrackingEnabled)) {
             AppMetrica.resumeSession(getCurrentActivity());
         }
     }
@@ -136,4 +137,18 @@ public class AppMetricaModule extends ReactContextBaseJavaModule {
     public void reportAdRevenue(ReadableMap revenue) {
         AppMetrica.reportAdRevenue(Utils.toAdRevenue(revenue));
     }
+
+    @ReactMethod
+    public void reportUserProfile(ReadableMap userProfile) {
+        try {
+            AppMetrica.reportUserProfile(Utils.toUserProfile(userProfile));
+        } catch (Throwable e) {
+            Log.w(TAG, "Cannot parse user profile", e);
+        }
+    }
+
+    @ReactMethod
+    public void putErrorEnvironmentValue(String key, String value) {
+        AppMetrica.putErrorEnvironmentValue(key, value);
+    }
 }

package/android/src/main/java/io/appmetrica/analytics/reactnative/UserProfileSerializer.java

@@ -0,0 +1,257 @@
+package io.appmetrica.analytics.reactnative;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+
+import io.appmetrica.analytics.profile.Attribute;
+import io.appmetrica.analytics.profile.BirthDateAttribute;
+import io.appmetrica.analytics.profile.BooleanAttribute;
+import io.appmetrica.analytics.profile.CounterAttribute;
+import io.appmetrica.analytics.profile.GenderAttribute;
+import io.appmetrica.analytics.profile.NameAttribute;
+import io.appmetrica.analytics.profile.NotificationsEnabledAttribute;
+import io.appmetrica.analytics.profile.NumberAttribute;
+import io.appmetrica.analytics.profile.StringAttribute;
+import io.appmetrica.analytics.profile.UserProfile;
+import io.appmetrica.analytics.profile.UserProfileUpdate;
+
+final class UserProfileSerializer {
+    private UserProfileSerializer() {}
+
+    @NonNull
+    public static UserProfile fromReadableMap(@NonNull ReadableMap profileMap){
+
+        ReadableArray attributes = profileMap.getArray("attributes");
+        if (attributes == null) {
+            throw new IllegalArgumentException();
+        }
+        UserProfile.Builder builder = UserProfile.newBuilder();
+
+        for (int idx = 0; idx < attributes.size(); idx++) {
+
+            ReadableMap attribute = attributes.getMap(idx);
+            if (attribute != null) {
+                builder.apply(parseUserProfileUpdate(attribute));
+            }
+        }
+
+        return builder.build();
+    }
+
+    @NonNull
+    private static UserProfileUpdate<?> parseUserProfileUpdate(@NonNull ReadableMap map){
+        String type = map.getString("type");
+
+        if (type == null) {
+            throw new IllegalArgumentException("Type should not be null");
+        }
+
+        if (type.startsWith("BirthDate")) {
+            return parseBirthDate(type, map);
+        }
+        if (type.startsWith("Boolean")) {
+            return parseBoolean(type, map);
+        }
+        if (type.startsWith("Counter")) {
+            return parseCounter(type, map);
+        }
+        if (type.startsWith("Gender")) {
+            return parseGender(type, map);
+        }
+        if (type.startsWith("Name")) {
+            return parseName(type, map);
+        }
+        if (type.startsWith("NotificationsEnabled")) {
+            return parseNotificationsEnabled(type, map);
+        }
+        if (type.startsWith("Number")) {
+            return parseNumber(type, map);
+        }
+        if (type.startsWith("String")) {
+            return parseString(type, map);
+        }
+        throw new IllegalArgumentException("Unknown UserProfile type " + type);
+    }
+
+    @NonNull
+    private static UserProfileUpdate<?> parseBirthDate(@NonNull String type, @NonNull ReadableMap map) {
+        BirthDateAttribute att = Attribute.birthDate();
+        switch (type) {
+            case "BirthDateWithAge": {
+                int age = map.getInt("age");
+                boolean ifUndefined = map.getBoolean("ifUndefined");
+                return ifUndefined ? att.withAgeIfUndefined(age) : att.withAge(age);
+            }
+            case "BirthDateWithYear": {
+                int year = map.getInt("year");
+                boolean ifUndefined = map.getBoolean("ifUndefined");
+                return ifUndefined ? att.withBirthDateIfUndefined(year) : att.withBirthDate(year);
+            }
+            case "BirthDateWithMonth": {
+                int year = map.getInt("year");
+                int month = map.getInt("month");
+                boolean ifUndefined = map.getBoolean("ifUndefined");
+                return ifUndefined ? att.withBirthDateIfUndefined(year, month) : att.withBirthDate(year, month);
+            }
+            case "BirthDateWithDay": {
+                int year = map.getInt("year");
+                int month = map.getInt("month");
+                int days = map.getInt("day");
+                boolean ifUndefined = map.getBoolean("ifUndefined");
+                return ifUndefined ? att.withBirthDateIfUndefined(year, month, days) : att.withBirthDate(year, month, days);
+            }
+            case "BirthDateValueReset": {
+                return att.withValueReset();
+            }
+        }
+        throw new IllegalArgumentException("Unknown UserProfile type " + type);
+    }
+
+    @NonNull
+    private static UserProfileUpdate<?> parseBoolean(@NonNull String type, @NonNull ReadableMap map) {
+        String key = map.getString("key");
+        if (key == null) {
+            throw new IllegalArgumentException("Key should not be null");
+        }
+        BooleanAttribute att = Attribute.customBoolean(key);
+        switch (type) {
+            case "BooleanValue": {
+                boolean value = map.getBoolean("value");
+                boolean ifUndefined = map.getBoolean("ifUndefined");
+                return ifUndefined ? att.withValueIfUndefined(value) : att.withValue(value);
+            }
+            case "BooleanValueReset": {
+                return att.withValueReset();
+            }
+        }
+        throw new IllegalArgumentException("Unknown UserProfile type " + type);
+    }
+
+    @NonNull
+    private static UserProfileUpdate<?> parseCounter(@NonNull String type, @NonNull ReadableMap map)  {
+        String key = map.getString("key");
+        if (key == null) {
+            throw new IllegalArgumentException("Key should not be null");
+        }
+        CounterAttribute att = Attribute.customCounter(key);
+        if (type.equals("Counter")) {
+            double delta = map.getDouble("delta");
+            return att.withDelta(delta);
+        }
+        throw new IllegalArgumentException("Unknown UserProfile type " + type);
+    }
+
+    @NonNull
+    private static UserProfileUpdate<?> parseGender(@NonNull String type, @NonNull ReadableMap map) {
+        GenderAttribute att = Attribute.gender();
+        // BirthDate
+        switch (type) {
+            case "GenderValue": {
+                String value = map.getString("value");
+                if (value == null) {
+                    throw new IllegalArgumentException("Value should not be null");
+                }
+
+                GenderAttribute.Gender gender = getGender(value);
+                boolean ifUndefined = map.getBoolean("ifUndefined");
+                return ifUndefined ? att.withValueIfUndefined(gender) : att.withValue(gender);
+            }
+            case "GenderValueReset": {
+                return att.withValueReset();
+            }
+        }
+        throw new IllegalArgumentException("Unknown UserProfile type " + type);
+    }
+
+    @NonNull
+    private static GenderAttribute.Gender getGender(@NonNull String value) {
+        switch (value) {
+            case "female":
+                return GenderAttribute.Gender.FEMALE;
+            case "male":
+                return GenderAttribute.Gender.MALE;
+            default:
+                return GenderAttribute.Gender.OTHER;
+        }
+    }
+
+    @NonNull
+    private static UserProfileUpdate<?> parseName(@NonNull String type, @NonNull ReadableMap map) {
+        NameAttribute att = Attribute.name();
+        switch (type) {
+            case "NameValue": {
+                String value = map.getString("value");
+                if (value == null) {
+                    throw new IllegalArgumentException("Value should not be null");
+                }
+                boolean ifUndefined = map.getBoolean("ifUndefined");
+                return ifUndefined ? att.withValueIfUndefined(value) : att.withValue(value);
+            }
+            case "NameValueReset": {
+                return att.withValueReset();
+            }
+        }
+        throw new IllegalArgumentException("Unknown UserProfile type " + type);
+    }
+
+    @NonNull
+    private static UserProfileUpdate<?> parseNotificationsEnabled(@NonNull String type, @NonNull ReadableMap map) {
+        NotificationsEnabledAttribute att = Attribute.notificationsEnabled();
+        switch (type) {
+            case "NotificationsEnabledValue": {
+                boolean value = map.getBoolean("value");
+                boolean ifUndefined = map.getBoolean("ifUndefined");
+                return ifUndefined ? att.withValueIfUndefined(value) : att.withValue(value);
+            }
+            case "NotificationsEnabledValueReset": {
+                return att.withValueReset();
+            }
+        }
+        throw new IllegalArgumentException("Unknown UserProfile type " + type);
+    }
+
+    @NonNull
+    private static UserProfileUpdate<?> parseNumber(@NonNull String type, @NonNull ReadableMap map) {
+        String key = map.getString("key");
+        if (key == null) {
+            throw new IllegalArgumentException("Key should not be null");
+        }
+        NumberAttribute att = Attribute.customNumber(key);
+        switch (type) {
+            case "NumberValue": {
+                double value = map.getDouble("value");
+                boolean ifUndefined = map.getBoolean("ifUndefined");
+                return ifUndefined ? att.withValueIfUndefined(value) : att.withValue(value);
+            }
+            case "NumberValueReset": {
+                return att.withValueReset();
+            }
+        }
+        throw new IllegalArgumentException("Unknown UserProfile type " + type);
+    }
+
+    @NonNull
+    private static UserProfileUpdate<?> parseString(@NonNull String type, @NonNull ReadableMap map) {
+        String key = map.getString("key");
+        if (key == null) {
+            throw new IllegalArgumentException("Key should not be null");
+        }
+        StringAttribute att = Attribute.customString(key);
+        switch (type) {
+            case "StringValue": {
+                String value = map.getString("value");
+                if (value == null) {
+                    throw new IllegalArgumentException("Value should not be null");
+                }
+                boolean ifUndefined = map.getBoolean("ifUndefined");
+                return ifUndefined ? att.withValueIfUndefined(value) : att.withValue(value);
+            }
+            case "StringValueReset": {
+                return att.withValueReset();
+            }
+        }
+        throw new IllegalArgumentException("Unknown UserProfile type " + type);
+    }
+}

package/android/src/main/java/io/appmetrica/analytics/reactnative/Utils.java

@@ -13,6 +13,7 @@ import io.appmetrica.analytics.AppMetricaConfig;
 import io.appmetrica.analytics.PreloadInfo;
 import io.appmetrica.analytics.Revenue;
 import io.appmetrica.analytics.StartupParamsCallback;
+import io.appmetrica.analytics.profile.UserProfile;
 import io.appmetrica.analytics.ecommerce.ECommerceAmount;
 import io.appmetrica.analytics.ecommerce.ECommerceCartItem;
 import io.appmetrica.analytics.ecommerce.ECommerceEvent;
@@ -71,6 +72,18 @@ abstract class Utils {
         if (configMap.hasKey("sessionsAutoTracking")) {
             builder.withSessionsAutoTrackingEnabled(configMap.getBoolean("sessionsAutoTracking"));
         }
+        if (configMap.hasKey("userProfileID")) {
+            builder.withUserProfileID(configMap.getString("userProfileID"));
+        }
+        if (configMap.hasKey("errorEnvironment")) {
+            ReadableMap errorEnvironmentMap = configMap.getMap("errorEnvironment");
+            if (errorEnvironmentMap != null) {
+                for (Map.Entry<String, Object> entry : errorEnvironmentMap.toHashMap().entrySet()) {
+                    Object value = entry.getValue();
+                    builder.withErrorEnvironmentValue(entry.getKey(), value == null ? null : value.toString());
+                }
+            }
+        }
 
         return builder.build();
     }
@@ -454,6 +467,11 @@ abstract class Utils {
         }
     }
 
+    @NonNull
+    static UserProfile toUserProfile(ReadableMap userProfileMap) {
+        return UserProfileSerializer.fromReadableMap(userProfileMap);
+    }
+
     @Nullable
     private static Map<String, String> toMapOfStrings(@Nullable ReadableMap oldMap) {
         if (oldMap == null) {

package/appmetrica-react-native-analytics.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm}"
 
-  s.dependency "AppMetricaAnalytics", "5.4.0"
+  s.dependency "AppMetricaAnalytics", "5.8.0"
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

package/ios/AMARNAppMetrica.m

@@ -2,6 +2,7 @@
 #import "AMARNAppMetrica.h"
 #import "AMARNAppMetricaUtils.h"
 #import "AMARNStartupParamsUtils.h"
+#import "AMARNUserProfileSerializer.h"
 #import <AppMetricaCrashes/AppMetricaCrashes.h>
 
 @implementation AMARNAppMetrica
@@ -109,6 +110,16 @@ RCT_EXPORT_METHOD(reportAdRevenue:(NSDictionary *)revenueDict)
     [AMAAppMetrica reportAdRevenue:[AMARNAppMetricaUtils adRevenueForDict:revenueDict] onFailure:nil];
 }
 
+RCT_EXPORT_METHOD(reportUserProfile:(NSDictionary *)userProfileDict)
+{
+    [AMAAppMetrica reportUserProfile:[AMARNAppMetricaUtils userProfileForDict:userProfileDict] onFailure:nil];
+}
+
+RCT_EXPORT_METHOD(putErrorEnvironmentValue:(NSString *)key:(NSString *)value)
+{
+    [[AMAAppMetricaCrashes crashes] setErrorEnvironmentValue:value forKey:key];
+}
+
 - (NSObject *)wrap:(NSObject *)value
 {
     if (value == nil) {

package/ios/AMARNAppMetricaUtils.h

@@ -2,6 +2,7 @@
 #import <CoreLocation/CoreLocation.h>
 #import <AppMetricaCore/AppMetricaCore.h>
 #import <AppMetricaCrashes/AppMetricaCrashes.h>
+#import "AMARNUserProfileSerializer.h"
 
 @interface AMARNAppMetricaUtils : NSObject
 
@@ -20,5 +21,6 @@
 + (AMAAdRevenueInfo *)adRevenueForDict:(NSDictionary *)revenueDict;
 + (AMAAdType)toAdType:(NSString *)type;
 + (NSDictionary *)convertRevenueInfoPayload:(NSString *)payload;
++ (AMAUserProfile *)userProfileForDict:(NSDictionary *)userProfileDict;
 
 @end

package/ios/AMARNAppMetricaUtils.m

@@ -40,6 +40,9 @@
     if (configDict[@"maxReportsInDatabaseCount"] != nil) {
         configuration.maxReportsInDatabaseCount = [configDict[@"maxReportsInDatabaseCount"] unsignedIntegerValue];
     }
+    if (configDict[@"userProfileID"] != nil) {
+        configuration.userProfileID = configDict[@"userProfileID"];
+    }
 
     return configuration;
 }
@@ -50,6 +53,12 @@
     if (crashConfigDict[@"crashReporting"] != nil) {
         crashesConfiguration.autoCrashTracking = [crashConfigDict[@"crashReporting"] boolValue];
     }
+    if (crashConfigDict[@"errorEnvironment"] != nil) {
+        NSDictionary *errorEnvironmentDict = crashConfigDict[@"errorEnvironment"];
+        for (NSString *key in errorEnvironmentDict) {
+            [[AMAAppMetricaCrashes crashes] setErrorEnvironmentValue:errorEnvironmentDict[key] forKey:key];
+        }
+    }
     return crashesConfiguration;
 }
 
@@ -113,7 +122,7 @@
                                                        categoryComponents:categoriesPath
                                                               searchQuery:searchQuery
                                                                   payload:payload];
-    
+
     return screen;
 }
 
@@ -124,16 +133,16 @@
     }
     AMAECommerceAmount *amount = [self ecommerceAmountForDict:ecommercePriceDict[@"amount"]];
     NSArray *componentsArray = ecommercePriceDict[@"internalComponents"];
-    
+
     NSMutableArray *components = [[NSMutableArray alloc] init];
 
     for (NSDictionary *item in componentsArray) {
         [components addObject:[self ecommerceAmountForDict:item]];
     }
-    
+
     AMAECommercePrice *price = [[AMAECommercePrice alloc] initWithFiat:amount
                                                     internalComponents:components];
-    
+
     return price;
 }
 
@@ -145,7 +154,7 @@
     NSString *type = ecommerceReferrerDict[@"type"];
     NSString *identifier = ecommerceReferrerDict[@"identifier"];
     AMAECommerceScreen *screen = [self ecommerceScreenForDict:ecommerceReferrerDict[@"screen"]];
-    
+
     AMAECommerceReferrer *referrer = [[AMAECommerceReferrer alloc] initWithType:type
                                                                      identifier:identifier
                                                                          screen:screen];
@@ -164,7 +173,7 @@
     NSDictionary *payload = ecommerceProductDict[@"payload"];
     AMAECommercePrice *actualPrice = [self ecommercePriceForDict:ecommerceProductDict[@"actualPrice"]];
     AMAECommercePrice *originalPrice = [self ecommercePriceForDict:ecommerceProductDict[@"originalPrice"]];
-    
+
     AMAECommerceProduct *product = [[AMAECommerceProduct alloc] initWithSKU:sku
                                                                        name:name
                                                          categoryComponents:categoriesPath
@@ -184,7 +193,7 @@
     AMAECommercePrice *price = [self ecommercePriceForDict:ecommerceCartItemDict[@"price"]];
     NSDecimalNumber *quantity = [NSDecimalNumber decimalNumberWithDecimal:[ecommerceCartItemDict[@"quantity"] decimalValue]];
     AMAECommerceReferrer *referrer = [self ecommerceReferrerForDict:ecommerceCartItemDict[@"referrer"]];
-    
+
     AMAECommerceCartItem *items = [[AMAECommerceCartItem alloc] initWithProduct:product quantity:quantity revenue:price referrer:referrer];
     return items;
 }
@@ -202,7 +211,7 @@
     for (NSDictionary *item in cartItemsArrayDict) {
         [cartItems addObject:[self ecommerceCartItemForDict:item]];
     }
-    
+
     AMAECommerceOrder *order = [[AMAECommerceOrder alloc] initWithIdentifier:orderId cartItems:cartItems payload:payload];
     return order;
 }
@@ -212,7 +221,7 @@
     if (ecommerceAmountDict == nil) {
         return nil;
     }
-    
+
     NSString *unit = ecommerceAmountDict[@"unit"];
     NSDecimalNumber *value = [NSDecimalNumber decimalNumberWithDecimal:[ecommerceAmountDict[@"amount"] decimalValue]];
     AMAECommerceAmount *amount = [[AMAECommerceAmount alloc] initWithUnit:unit value:value];
@@ -251,7 +260,7 @@
     if ([type isEqualToString:@"removeCartItemEvent"]) {
         AMAECommerceCartItem *item = [self ecommerceCartItemForDict:ecommerceDict[@"cartItem"]];
         AMAECommerce *event = [AMAECommerce removeCartItemEventWithItem:item];
-        
+
         return event;
     }
     if ([type isEqualToString:@"beginCheckoutEvent"]) {
@@ -267,7 +276,7 @@
     return nil;
 }
 
-+ (AMARevenueInfo *)revenueForDict:(NSDictionary *)revenueDict 
++ (AMARevenueInfo *)revenueForDict:(NSDictionary *)revenueDict
 {
     NSNumber *number = revenueDict[@"price"];
     NSDecimalNumber *price = [NSDecimalNumber decimalNumberWithDecimal:number.decimalValue];
@@ -294,7 +303,7 @@
     return revenueInfo;
 }
 
-+ (AMAAdRevenueInfo *)adRevenueForDict:(NSDictionary *)revenueDict 
++ (AMAAdRevenueInfo *)adRevenueForDict:(NSDictionary *)revenueDict
 {
     NSNumber *number = revenueDict[@"price"];
     NSDecimalNumber *price = [NSDecimalNumber decimalNumberWithDecimal:number.decimalValue];
@@ -365,4 +374,9 @@
     }
 }
 
++ (AMAUserProfile *)userProfileForDict:(NSDictionary *)userProfileDict
+{
+    return amarn_deserializeUserProfile(userProfileDict);
+}
+
 @end

package/ios/AMARNUserProfileSerializer.h

@@ -0,0 +1,6 @@
+
+#import <AppMetricaCore/AppMetricaCore.h>
+
+@class AMAUserProfile;
+
+AMAUserProfile *amarn_deserializeUserProfile(NSDictionary *dictionary);