From a47e703bcc1fa6d7c8edc82794d98c281b04ef6b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 15 Apr 2018 23:23:39 -0400 Subject: [PATCH] Allow sending properties with events --- domain/src/main/java/manager/AnalyticsManager.kt | 2 +- .../java/common/util/AnalyticsManagerImpl.kt | 2 +- .../java/common/util/AnalyticsManagerImpl.kt | 12 ++++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/domain/src/main/java/manager/AnalyticsManager.kt b/domain/src/main/java/manager/AnalyticsManager.kt index 9fd2beb7..89ed3935 100644 --- a/domain/src/main/java/manager/AnalyticsManager.kt +++ b/domain/src/main/java/manager/AnalyticsManager.kt @@ -20,7 +20,7 @@ package manager interface AnalyticsManager { - fun track(event: String) + fun track(event: String, vararg properties: Pair) fun setUserProperty(key: String, value: Any) diff --git a/presentation/src/noAnalytics/java/common/util/AnalyticsManagerImpl.kt b/presentation/src/noAnalytics/java/common/util/AnalyticsManagerImpl.kt index 66ab3a6a..ad13b73c 100644 --- a/presentation/src/noAnalytics/java/common/util/AnalyticsManagerImpl.kt +++ b/presentation/src/noAnalytics/java/common/util/AnalyticsManagerImpl.kt @@ -25,7 +25,7 @@ import javax.inject.Singleton @Singleton class AnalyticsManagerImpl @Inject constructor() : AnalyticsManager { - override fun track(event: String) { + override fun track(event: String, vararg properties: Pair) { // Do nothing } diff --git a/presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt b/presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt index 9b3dd882..3e3b4c60 100644 --- a/presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt +++ b/presentation/src/withAnalytics/java/common/util/AnalyticsManagerImpl.kt @@ -32,16 +32,20 @@ import javax.inject.Inject import javax.inject.Singleton @Singleton -class AnalyticsManagerImpl @Inject constructor(context: Context): AnalyticsManager { +class AnalyticsManagerImpl @Inject constructor(context: Context) : AnalyticsManager { private val amplitude: AmplitudeClient = Amplitude.getInstance().initialize(context, BuildConfig.AMPLITUDE_API_KEY) private val mixpanel: MixpanelAPI = MixpanelAPI.getInstance(context, BuildConfig.MIXPANEL_API_KEY) - override fun track(event: String) { - amplitude.logEvent(event) + override fun track(event: String, vararg properties: Pair) { + val propertiesJson = JSONObject(properties + .associateBy { pair -> pair.first } + .mapValues { pair -> pair.value.second }) + + amplitude.logEvent(event, propertiesJson) synchronized(mixpanel, { - mixpanel.track(event) + mixpanel.track(event, propertiesJson) }) }