From b566c8ddb3447749fb2882908c84b9ce0d73dffc Mon Sep 17 00:00:00 2001 From: Tyler Jones Date: Fri, 12 Jun 2020 10:37:45 -0700 Subject: [PATCH 1/2] feat(android): allow passing integration options Add support for passing object integration data on Android. --- .../segment/analytics/reactnative/core/RNAnalyticsModule.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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..c613226fd 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 @@ -245,7 +245,11 @@ private fun optionsFrom(context: ReadableMap?, integrations: ReadableMap?): Opti } integrations?.toHashMap()?.forEach { (key, value) -> - options.setIntegration(key, value.toString().toBoolean()) + if (value is HashMap<*, *>) { + options.setIntegrationOptions(key, value.toMap() as Map) + } else { + options.setIntegration(key, value.toString().toBoolean()) + } } return options From ea2228902b1fa866221a42abb67a371b153b72b0 Mon Sep 17 00:00:00 2001 From: Prayansh Srivastava Date: Mon, 15 Jun 2020 12:43:48 -0700 Subject: [PATCH 2/2] use Any rather than Object --- .../com/segment/analytics/reactnative/core/RNAnalyticsModule.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c613226fd..5be737e37 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 @@ -246,7 +246,7 @@ private fun optionsFrom(context: ReadableMap?, integrations: ReadableMap?): Opti integrations?.toHashMap()?.forEach { (key, value) -> if (value is HashMap<*, *>) { - options.setIntegrationOptions(key, value.toMap() as Map) + options.setIntegrationOptions(key, value.toMap() as Map) } else { options.setIntegration(key, value.toString().toBoolean()) }