From c5dfa4ac49c2036e582514638bfb9cff836cd180 Mon Sep 17 00:00:00 2001
From: Prayansh Srivastava <prayansh@gmail.com>
Date: Mon, 15 Jun 2020 11:00:36 -0700
Subject: [PATCH] fix(android): parse android specific options correctly

---
 .../reactnative/core/RNAnalyticsModule.kt        | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/core/android/src/main/java/com/segment/analytics/reactnative/core/RNAnalyticsModule.kt b/packages/core/android/src/main/java/com/segment/analytics/reactnative/core/RNAnalyticsModule.kt
index 0a6ee2f5c..15e63ebe6 100644
--- a/packages/core/android/src/main/java/com/segment/analytics/reactnative/core/RNAnalyticsModule.kt
+++ b/packages/core/android/src/main/java/com/segment/analytics/reactnative/core/RNAnalyticsModule.kt
@@ -134,11 +134,17 @@ class RNAnalyticsModule(context: ReactApplicationContext): ReactContextBaseJavaM
             builder.trackAttributionInformation()
         }
 
-        if(options.hasKey("flushInterval")) {
-            builder.flushInterval(
-                    options.getInt("flushInterval").toLong(),
-                    TimeUnit.MILLISECONDS
-            )
+        if(options.hasKey("android") && options.getType("android") == ReadableType.Map) {
+            val androidOptions = options.getMap("android")!!
+            if(androidOptions.hasKey("flushInterval")) {
+                builder.flushInterval(
+                        androidOptions.getInt("flushInterval").toLong(),
+                        TimeUnit.MILLISECONDS
+                )
+            }
+            if(androidOptions.hasKey("collectDeviceId")) {
+                builder.collectDeviceId(androidOptions.getBoolean("collectDeviceId"))
+            }
         }
 
         if(options.getBoolean("debug")) {