@appmetrica/react-native-analytics 3.5.0 → 4.0.0

package/android/build.gradle

@@ -5,24 +5,12 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
+    classpath "com.android.tools.build:gradle:8.2.1"
   }
 }
 
-def reactNativeArchitectures() {
-  def value = rootProject.getProperties().get("reactNativeArchitectures")
-  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
-
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
-
 apply plugin: "com.android.library"
-
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
+apply plugin: "com.facebook.react"
 
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["AppMetrica_" + name]
@@ -73,6 +61,14 @@ android {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8
   }
+
+  sourceSets {
+    main {
+      java.srcDirs += [
+        "generated/java"
+      ]
+    }
+  }
 }
 
 repositories {
@@ -84,6 +80,6 @@ dependencies {
   // For < 0.71, this will be from the local maven repo
   // 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:7.11.0"
+  implementation "com.facebook.react:react-android"
+  implementation("io.appmetrica.analytics:analytics:8.0.0")
 }

package/android/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
           package="io.appmetrica.analytics.reactnative">
 
     <application>
-        <meta-data android:name="io.appmetrica.analytics.plugin_id" android:value="react-native-3.5.0" />
+        <meta-data android:name="io.appmetrica.analytics.plugin_id" android:value="react-native-4.0.0" />
     </application>
 
 </manifest>

package/android/src/main/AndroidManifestNew.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
-        <meta-data android:name="io.appmetrica.analytics.plugin_id" android:value="react-native-3.5.0" />
+        <meta-data android:name="io.appmetrica.analytics.plugin_id" android:value="react-native-4.0.0" />
     </application>
 
 </manifest>

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

@@ -1,28 +1,26 @@
 package io.appmetrica.analytics.reactnative;
 
-import android.text.TextUtils;
 import android.util.Log;
+
 import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-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 java.util.Iterator;
+import java.util.HashMap;
 import java.util.Map;
 
 import io.appmetrica.analytics.AppMetrica;
 import io.appmetrica.analytics.AppMetricaConfig;
 import io.appmetrica.analytics.ModulesFacade;
+import io.appmetrica.analytics.StartupParamsCallback;
 import io.appmetrica.analytics.ecommerce.ECommerceEvent;
 import io.appmetrica.analytics.plugins.PluginErrorDetails;
 
-@ReactModule(name = AppMetricaModule.NAME)
-public class AppMetricaModule extends ReactContextBaseJavaModule {
+
+public class AppMetricaModule extends NativeAppMetricaSpec {
 
     public static final String NAME = "AppMetrica";
     public static final String TAG = "AppMetricaModule";
@@ -41,7 +39,7 @@ public class AppMetricaModule extends ReactContextBaseJavaModule {
         return NAME;
     }
 
-    @ReactMethod
+    @Override
     public void activate(ReadableMap configMap) {
         AppMetricaConfig config = Utils.toAppMetricaConfig(configMap);
         AppMetrica.activate(reactContext, config);
@@ -50,33 +48,33 @@ public class AppMetricaModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
-    public void getLibraryApiLevel(Promise promise) {
-        promise.resolve(AppMetrica.getLibraryApiLevel());
+    @Override
+    public double getLibraryApiLevel() {
+        return AppMetrica.getLibraryApiLevel();
     }
 
-    @ReactMethod
-    public void getLibraryVersion(Promise promise) {
-        promise.resolve(AppMetrica.getLibraryVersion());
+    @Override
+    public String getLibraryVersion() {
+        return AppMetrica.getLibraryVersion();
     }
 
-    @ReactMethod
+    @Override
     public void pauseSession() {
-        AppMetrica.pauseSession(getCurrentActivity());
+        AppMetrica.pauseSession(reactContext.getCurrentActivity());
     }
 
-    @ReactMethod
+    @Override
     public void reportAppOpen(String deeplink) {
         AppMetrica.reportAppOpen(deeplink);
     }
 
-    @ReactMethod
+    @Override
     public void reportError(String identifier, String message, ReadableMap _reason) {
         PluginErrorDetails errorDetails = _reason != null ? ExceptionSerializer.fromObject(_reason) : null;
         AppMetrica.getPluginExtension().reportError(identifier, message, errorDetails);
     }
 
-    @ReactMethod
+    @Override
     public void reportEvent(String eventName, ReadableMap attributes) {
         if (attributes == null) {
             AppMetrica.reportEvent(eventName);
@@ -85,42 +83,42 @@ public class AppMetricaModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
-    public void requestStartupParams(ReadableArray identifiers, Callback listener) {
-        AppMetrica.requestStartupParams(reactContext, new ReactNativeStartupParamsListener(listener), Utils.toStartupKeyList(identifiers));
+    @Override
+    public void requestStartupParams(Callback listener, ReadableArray identifiers) {
+        AppMetrica.requestStartupParams(reactContext, new ReactNativeStartupParamsListener(listener), Utils.toListOfStrings(identifiers));
     }
 
-    @ReactMethod
+    @Override
     public void resumeSession() {
         AppMetrica.resumeSession(getCurrentActivity());
     }
 
-    @ReactMethod
+    @Override
     public void sendEventsBuffer() {
         AppMetrica.sendEventsBuffer();
     }
 
-    @ReactMethod
+    @Override
     public void setLocation(ReadableMap locationMap) {
         AppMetrica.setLocation(Utils.toLocation(locationMap));
     }
 
-    @ReactMethod
+    @Override
     public void setLocationTracking(boolean enabled) {
         AppMetrica.setLocationTracking(enabled);
     }
 
-    @ReactMethod
+    @Override
     public void setDataSendingEnabled(boolean enabled) {
         AppMetrica.setDataSendingEnabled(enabled);
     }
 
-    @ReactMethod
+    @Override
     public void setUserProfileID(String userProfileID) {
         AppMetrica.setUserProfileID(userProfileID);
     }
 
-    @ReactMethod
+    @Override
     public void reportECommerce(ReadableMap ecommerceEvent) {
         ECommerceEvent event = Utils.toECommerceEvent(ecommerceEvent);
         if (event != null) {
@@ -130,17 +128,17 @@ public class AppMetricaModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
+    @Override
     public void reportRevenue(ReadableMap revenue) {
         AppMetrica.reportRevenue(Utils.toRevenue(revenue));
     }
 
-    @ReactMethod
+    @Override
     public void reportAdRevenue(ReadableMap revenue) {
         AppMetrica.reportAdRevenue(Utils.toAdRevenue(revenue));
     }
 
-    @ReactMethod
+    @Override
     public void reportUserProfile(ReadableMap userProfile) {
         try {
             AppMetrica.reportUserProfile(Utils.toUserProfile(userProfile));
@@ -149,12 +147,12 @@ public class AppMetricaModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
+    @Override
     public void putErrorEnvironmentValue(String key, String value) {
         AppMetrica.putErrorEnvironmentValue(key, value);
     }
 
-    @ReactMethod
+    @Override
     public void reportErrorWithoutIdentifier(String message, ReadableMap error) {
         PluginErrorDetails details = ExceptionSerializer.fromObject(error);
         if (details.getStacktrace().isEmpty()) {
@@ -164,13 +162,13 @@ public class AppMetricaModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
+    @Override
     public void reportUnhandledException(ReadableMap error) {
         PluginErrorDetails details = ExceptionSerializer.fromObject(error);
         AppMetrica.getPluginExtension().reportUnhandledException(details);
     }
 
-    @ReactMethod
+    @Override
     public void reportExternalAttribution(ReadableMap attribution) {
         ModulesFacade.reportExternalAttribution(
                 ExternalAttributionSerializer.parseSource(attribution.getString("source")),
@@ -178,43 +176,52 @@ public class AppMetricaModule extends ReactContextBaseJavaModule {
         );
     }
 
-    @ReactMethod
+    @Override
     public void putAppEnvironmentValue(String key, String value) {
         AppMetrica.putAppEnvironmentValue(key, value);
     }
 
-    @ReactMethod
+    @Override
     public void clearAppEnvironment() {
         AppMetrica.clearAppEnvironment();
     }
 
-    @ReactMethod
+    @Override
     public void activateReporter(ReadableMap configMap) {
         AppMetrica.activateReporter(reactContext, Utils.toReporterConfig(configMap));
     }
 
-    @ReactMethod
+    @Override
     public void touchReporter(String apiKey) {
         AppMetrica.getReporter(reactContext, apiKey);
     }
 
-    @ReactMethod
-    public void getDeviceId(Promise promise) {
-        promise.resolve(AppMetrica.getDeviceId(reactContext));
+    @Override
+    public String getDeviceId() {
+        return AppMetrica.getDeviceId(reactContext);
     }
 
-    @ReactMethod
-    public void getUuid(Promise promise) {
-        promise.resolve(AppMetrica.getUuid(reactContext));
+    @Override
+    public String getUuid() {
+        return AppMetrica.getUuid(reactContext);
     }
 
-    @ReactMethod
+    @Override
     public void requestDeferredDeeplink(Callback failureCallback, Callback successCallback) {
         AppMetrica.requestDeferredDeeplink(new ReactNativeDeferredDeeplinkListener(failureCallback, successCallback));
     }
 
-    @ReactMethod
+    @Override
     public void requestDeferredDeeplinkParameters(Callback failureCallback, Callback successCallback) {
         AppMetrica.requestDeferredDeeplinkParameters(new ReactNativeDeferredDeeplinkParametersListener(failureCallback, successCallback));
     }
+
+    @Override
+    protected Map<String, Object> getTypedExportedConstants() {
+        Map<String, Object> constants = new HashMap<>();
+        constants.put("DEVICE_ID_HASH_KEY", StartupParamsCallback.APPMETRICA_DEVICE_ID_HASH);
+        constants.put("DEVICE_ID_KEY", StartupParamsCallback.APPMETRICA_DEVICE_ID);
+        constants.put("UUID_KEY", StartupParamsCallback.APPMETRICA_UUID);
+        return constants;
+    }
 }

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

@@ -2,28 +2,40 @@ package io.appmetrica.analytics.reactnative;
 
 import androidx.annotation.NonNull;
 
-import com.facebook.react.ReactPackage;
+import com.facebook.react.BaseReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
+
+public class AppMetricaPackage extends BaseReactPackage {
 
-public class AppMetricaPackage implements ReactPackage {
-    @NonNull
     @Override
-    public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
-        List<NativeModule> modules = new ArrayList<>();
-        modules.add(new AppMetricaModule(reactContext));
-        modules.add(new ReporterModule(reactContext));
-        return modules;
+    public NativeModule getModule(String name, @NonNull ReactApplicationContext reactContext) {
+        if (name.equals(AppMetricaModule.NAME)) {
+            return new AppMetricaModule(reactContext);
+        } else if (name.equals(ReporterModule.NAME)) {
+            return new ReporterModule(reactContext);
+        } else {
+            return null;
+        }
     }
 
     @NonNull
     @Override
-    public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
-        return Collections.emptyList();
+    public ReactModuleInfoProvider getReactModuleInfoProvider() {
+        return new ReactModuleInfoProvider() {
+            @NonNull
+            @Override
+            public Map<String, ReactModuleInfo> getReactModuleInfos() {
+                Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
+                moduleInfos.put(AppMetricaModule.NAME, new ReactModuleInfo(AppMetricaModule.NAME, AppMetricaModule.NAME, false, false, false, true));
+                moduleInfos.put(ReporterModule.NAME, new ReactModuleInfo(ReporterModule.NAME, ReporterModule.NAME, false, false, false, true));
+                return moduleInfos;
+            }
+        };
     }
 }

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

@@ -2,12 +2,10 @@ package io.appmetrica.analytics.reactnative;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+
 import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
 
 import io.appmetrica.analytics.DeferredDeeplinkListener;
-import io.appmetrica.analytics.StartupParamsCallback;
 
 public class ReactNativeDeferredDeeplinkListener implements DeferredDeeplinkListener {
 

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

@@ -1,16 +1,15 @@
 package io.appmetrica.analytics.reactnative;
 
 import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.bridge.Arguments;
 
-import io.appmetrica.analytics.DeferredDeeplinkListener;
-import io.appmetrica.analytics.DeferredDeeplinkParametersListener;
 import java.util.Map;
 
+import io.appmetrica.analytics.DeferredDeeplinkParametersListener;
+
 public class ReactNativeDeferredDeeplinkParametersListener implements DeferredDeeplinkParametersListener {
     @NonNull
     private final Callback failureListener;

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

@@ -3,10 +3,14 @@ package io.appmetrica.analytics.reactnative;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
+
+import java.util.Map;
+
 import io.appmetrica.analytics.StartupParamsCallback;
+import io.appmetrica.analytics.StartupParamsItem;
 
 public class ReactNativeStartupParamsListener implements StartupParamsCallback {
 
@@ -24,15 +28,27 @@ public class ReactNativeStartupParamsListener implements StartupParamsCallback {
 
     @Override
     public void onRequestError(@NonNull Reason reason, @Nullable Result result) {
-        listener.invoke(null, reason.value);
+        listener.invoke(toParamsMap(result), reason.value);
+    }
+
+    private static WritableMap convertParametersItem(StartupParamsItem paramsItem) {
+        WritableMap itemMap = Arguments.createMap();
+        if (paramsItem.getId() != null) {
+            itemMap.putString("id", paramsItem.getId());
+        }
+        if (paramsItem.getErrorDetails() != null) {
+            itemMap.putString("errorDetails", paramsItem.getErrorDetails());
+        }
+        itemMap.putString("status", paramsItem.getStatus().name());
+        return itemMap;
     }
 
     private static WritableMap toParamsMap(@Nullable Result result){
         if (result == null) return null;
-        WritableMap map = new WritableNativeMap();
-        map.putString("deviceId", result.deviceId);
-        map.putString("deviceIdHash", result.deviceIdHash);
-        map.putString("uuid", result.uuid);
-        return map;
+        WritableMap paramsMap = Arguments.createMap();
+        for (Map.Entry<String, StartupParamsItem> entry : result.parameters.entrySet()) {
+            paramsMap.putMap(entry.getKey(), convertParametersItem(entry.getValue()));
+        }
+        return paramsMap;
     }
 }

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

@@ -5,15 +5,13 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
 
 import io.appmetrica.analytics.AppMetrica;
 import io.appmetrica.analytics.ecommerce.ECommerceEvent;
 import io.appmetrica.analytics.plugins.PluginErrorDetails;
 
-public class ReporterModule extends ReactContextBaseJavaModule {
+public class ReporterModule extends NativeReporterSpec {
 
     public static final String NAME = "AppMetricaReporter";
 
@@ -33,13 +31,13 @@ public class ReporterModule extends ReactContextBaseJavaModule {
         return NAME;
     }
 
-    @ReactMethod
+    @Override
     public void reportError(String apiKey, String identifier, String message, ReadableMap _reason) {
         PluginErrorDetails errorDetails = _reason != null ? ExceptionSerializer.fromObject(_reason) : null;
         AppMetrica.getReporter(reactContext, apiKey).getPluginExtension().reportError(identifier, message, errorDetails);
     }
 
-    @ReactMethod
+    @Override
     public void reportErrorWithoutIdentifier(String apiKey, String message, ReadableMap error) {
         PluginErrorDetails details = ExceptionSerializer.fromObject(error);
         if (details.getStacktrace().isEmpty()) {
@@ -49,13 +47,13 @@ public class ReporterModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
+    @Override
     public void reportUnhandledException(String apiKey, ReadableMap error) {
         PluginErrorDetails details = ExceptionSerializer.fromObject(error);
         AppMetrica.getReporter(reactContext, apiKey).getPluginExtension().reportUnhandledException(details);
     }
 
-    @ReactMethod
+    @Override
     public void reportEvent(String apiKey, String eventName, ReadableMap attributes) {
         if (attributes == null) {
             AppMetrica.getReporter(reactContext, apiKey).reportEvent(eventName);
@@ -64,37 +62,38 @@ public class ReporterModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
+    @Override
     public void pauseSession(String apiKey) {
         AppMetrica.getReporter(reactContext, apiKey).pauseSession();
     }
 
-    @ReactMethod
+    @Override
     public void resumeSession(String apiKey) {
         AppMetrica.getReporter(reactContext, apiKey).resumeSession();
     }
 
-    @ReactMethod
+    @Override
     public void sendEventsBuffer(String apiKey) {
         AppMetrica.getReporter(reactContext, apiKey).sendEventsBuffer();
     }
 
-    @ReactMethod
+    @Override
     public void clearAppEnvironment(String apiKey) {
         AppMetrica.getReporter(reactContext, apiKey).clearAppEnvironment();
     }
 
-    @ReactMethod
+    @Override
     public void putAppEnvironmentValue(String apiKey, String key, String value) {
         AppMetrica.getReporter(reactContext, apiKey).putAppEnvironmentValue(key, value);
     }
 
-    @ReactMethod
+
+    @Override
     public void setUserProfileID(String apiKey, String userProfileID) {
         AppMetrica.getReporter(reactContext, apiKey).setUserProfileID(userProfileID);
     }
 
-    @ReactMethod
+    @Override
     public void reportUserProfile(String apiKey, ReadableMap userProfile) {
         try {
             AppMetrica.getReporter(reactContext, apiKey).reportUserProfile(Utils.toUserProfile(userProfile));
@@ -103,17 +102,17 @@ public class ReporterModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
+    @Override
     public void setDataSendingEnabled(String apiKey, boolean enabled) {
         AppMetrica.getReporter(reactContext, apiKey).setDataSendingEnabled(enabled);
     }
 
-    @ReactMethod
+    @Override
     public void reportAdRevenue(String apiKey, ReadableMap AdRevenueMap) {
         AppMetrica.getReporter(reactContext, apiKey).reportAdRevenue(Utils.toAdRevenue(AdRevenueMap));
     }
 
-    @ReactMethod
+    @Override
     public void reportECommerce(String apiKey, ReadableMap ecommerceEvent) {
         ECommerceEvent event = Utils.toECommerceEvent(ecommerceEvent);
         if (event != null) {
@@ -123,7 +122,7 @@ public class ReporterModule extends ReactContextBaseJavaModule {
         }
     }
 
-    @ReactMethod
+    @Override
     public void reportRevenue(String apiKey, ReadableMap revenueMap) {
         AppMetrica.getReporter(reactContext, apiKey).reportRevenue(Utils.toRevenue(revenueMap));
     }

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

@@ -13,7 +13,6 @@ import io.appmetrica.analytics.AppMetricaConfig;
 import io.appmetrica.analytics.PreloadInfo;
 import io.appmetrica.analytics.ReporterConfig;
 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;
@@ -320,7 +319,7 @@ abstract class Utils {
     static ECommerceEvent toECommerceEvent(@NonNull ReadableMap ecommerceEventMap) {
         String type = ecommerceEventMap.getString("ecommerceEvent");
         if (type == null) return null;
-        if (type.equals("showSceenEvent")) {
+        if (type.equals("showScreenEvent")) {
             ReadableMap screenMap = ecommerceEventMap.getMap("ecommerceScreen");
             if (screenMap != null) {
                 return ECommerceEvent.showScreenEvent(toECommerceScreen(screenMap));
@@ -367,24 +366,6 @@ abstract class Utils {
         return null;
     }
 
-    @NonNull
-    static List<String> toStartupKeyList(@NonNull ReadableArray keys) {
-        ArrayList<String> startupKeys = new ArrayList<>();
-        for (int i = 0; i < keys.size(); i++) {
-            String item = keys.getString(i);
-            if (item.equals("appmetrica_device_id_hash")) {
-                startupKeys.add(StartupParamsCallback.APPMETRICA_DEVICE_ID_HASH);
-            }
-            if (item.equals("appmetrica_device_id")) {
-                startupKeys.add(StartupParamsCallback.APPMETRICA_DEVICE_ID);
-            }
-            if (item.equals("appmetrica_uuid")) {
-                startupKeys.add(StartupParamsCallback.APPMETRICA_UUID);
-            }
-        }
-        return startupKeys;
-    }
-
     @NonNull
     static Revenue toRevenue(@NonNull ReadableMap revenueMap) {
         long price = (long) (revenueMap.getDouble("price") * 1000000);
@@ -504,15 +485,14 @@ abstract class Utils {
         return newMap;
     }
 
-    @Nullable
-    private static List<String> toListOfStrings(@Nullable ReadableArray oldArray) {
+    @NonNull
+    static List<String> toListOfStrings(@Nullable ReadableArray oldArray) {
+        List<String> newArray = new ArrayList<>();
         if (oldArray == null) {
-            return null;
+            return newArray;
         }
-        List<Object> list = oldArray.toArrayList();
-        List<String> newArray = new ArrayList<String>(list.size());
-        for (Object object : list) {
-            newArray.add(Objects.toString(object));
+        for (int i = 0; i < oldArray.size(); i++) {
+            newArray.add(oldArray.getString(i));
         }
         return newArray;
     }