Skip to content

[WIP] Fix missing context on Android #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[WIP] Fix missing context on Android #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/core/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,14 @@ repositories {
name 'React Native (local)'
}
mavenCentral()
maven { url 'https://jitpack.io' }
}


dependencies {
api 'com.segment.analytics.android:analytics:4.+'
// api 'com.segment.analytics.android:analytics:4.+'
api 'com.github.segmentio:analytics-android:feat~add-options-context-SNAPSHOT'


api 'com.facebook.react:react-native:+'
api 'org.jetbrains.kotlin:kotlin-stdlib:1.2.+'
Expand Down
43 changes: 34 additions & 9 deletions ...es/core/android/src/main/java/com/segment/analytics/reactnative/core/RNAnalyticsModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ 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 com.segment.analytics.Analytics
import com.segment.analytics.Properties
import com.segment.analytics.Traits
import com.segment.analytics.ValueMap
import com.segment.analytics.*
import java.util.concurrent.TimeUnit

class RNAnalyticsModule(context: ReactApplicationContext): ReactContextBaseJavaModule(context) {
Expand Down Expand Up @@ -77,23 +74,43 @@ class RNAnalyticsModule(context: ReactApplicationContext): ReactContextBaseJavaM

@ReactMethod
fun track(event: String, properties: ReadableMap, context: ReadableMap) =
analytics.track(event, Properties() from properties)
analytics.track(
event,
Properties() from properties,
Options() from context
)

@ReactMethod
fun screen(name: String, properties: ReadableMap, context: ReadableMap) =
analytics.screen(name, Properties() from properties)
analytics.screen(
null,
name,
Properties() from properties,
Options() from context
)

@ReactMethod
fun identify(userId: String, traits: ReadableMap, context: ReadableMap) =
analytics.identify(userId, Traits() from traits, null)
analytics.identify(
userId,
Traits() from traits,
Options() from context
)

@ReactMethod
fun group(groupId: String, traits: ReadableMap, context: ReadableMap) =
analytics.group(groupId, Traits() from traits)
analytics.group(
groupId,
Traits() from traits,
Options() from context
)

@ReactMethod
fun alias(newId: String, context: ReadableMap) =
analytics.alias(newId)
analytics.alias(
newId,
Options() from context
)

@ReactMethod
fun reset() =
Expand All @@ -112,6 +129,14 @@ class RNAnalyticsModule(context: ReactApplicationContext): ReactContextBaseJavaM
analytics.optOut(true)
}

private infix fun<T: Options> T.from(source: ReadableMap): T {
source.toHashMap().forEach {(key, value) ->
putContext(key, value)
}

return this
}

private infix fun<T: ValueMap> T.from(source: ReadableMap): T {
putAll(source.toHashMap())

Expand Down