Skip to content

Commit e175fc0

Browse files
authored
Merge pull request GitLiveApp#570 from Qw4z1/nullableuserid
Make setUserId accept nullable user id to clear user id.
2 parents 1abbb9b + d7e88f5 commit e175fc0

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

firebase-analytics/src/androidMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public actual class FirebaseAnalytics(public val android: com.google.firebase.an
2323
public actual fun setUserProperty(name: String, value: String) {
2424
android.setUserProperty(name, value)
2525
}
26-
public actual fun setUserId(id: String) {
26+
public actual fun setUserId(id: String?) {
2727
android.setUserId(id)
2828
}
2929
public actual fun resetAnalyticsData() {

firebase-analytics/src/commonMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public expect fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics
1313
public expect class FirebaseAnalytics {
1414
public fun logEvent(name: String, parameters: Map<String, Any>? = null)
1515
public fun setUserProperty(name: String, value: String)
16-
public fun setUserId(id: String)
16+
public fun setUserId(id: String?)
1717
public fun setAnalyticsCollectionEnabled(enabled: Boolean)
1818
public fun setSessionTimeoutInterval(sessionTimeoutInterval: Duration)
1919
public suspend fun getSessionId(): Long?

firebase-analytics/src/iosMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public actual class FirebaseAnalytics(public val ios: FIRAnalytics.Companion) {
2323
public actual fun setUserProperty(name: String, value: String) {
2424
ios.setUserPropertyString(value, name)
2525
}
26-
public actual fun setUserId(id: String) {
26+
public actual fun setUserId(id: String?) {
2727
ios.setUserID(id)
2828
}
2929
public actual fun resetAnalyticsData() {

firebase-analytics/src/jsMain/kotlin/dev/gitlive/firebase/analytics/analytics.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public actual class FirebaseAnalytics(public val js: dev.gitlive.firebase.analyt
2525
dev.gitlive.firebase.analytics.externals.setUserProperty(js, name, value)
2626
}
2727

28-
public actual fun setUserId(id: String) {
28+
public actual fun setUserId(id: String?) {
2929
dev.gitlive.firebase.analytics.externals.setUserId(js, id)
3030
}
3131

firebase-analytics/src/jsMain/kotlin/dev/gitlive/firebase/analytics/externals/analytics.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public external fun getAnalytics(app: FirebaseApp? = definedExternally): Firebas
1111

1212
public external fun logEvent(app: FirebaseAnalytics, name: String, parameters: Map<String, Any>?)
1313
public external fun setUserProperty(app: FirebaseAnalytics, name: String, value: String)
14-
public external fun setUserId(app: FirebaseAnalytics, id: String)
14+
public external fun setUserId(app: FirebaseAnalytics, id: String?)
1515
public external fun resetAnalyticsData(app: FirebaseAnalytics)
1616
public external fun setDefaultEventParameters(app: FirebaseAnalytics, parameters: Map<String, String>)
1717
public external fun setAnalyticsCollectionEnabled(app: FirebaseAnalytics, enabled: Boolean)

firebase-analytics/src/jvmMain/kotlin/dev/gitlive/firebase/analytics/analytics.jvm.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public actual fun Firebase.analytics(app: FirebaseApp): FirebaseAnalytics {
1414

1515
public actual class FirebaseAnalytics {
1616
public actual fun setUserProperty(name: String, value: String) {}
17-
public actual fun setUserId(id: String) {}
17+
public actual fun setUserId(id: String?) {}
1818
public actual fun resetAnalyticsData() {}
1919
public actual fun setAnalyticsCollectionEnabled(enabled: Boolean) {}
2020
public actual fun setSessionTimeoutInterval(sessionTimeoutInterval: Duration) {}

0 commit comments

Comments
 (0)