From 707dfa71769045a76784071890c26967b92580b6 Mon Sep 17 00:00:00 2001 From: Miranda Wilson Date: Thu, 9 May 2024 16:33:43 +0100 Subject: [PATCH] Make OkHttpNetworkConnection serverAnon property public --- .../snowplowdemocompose/data/Tracking.kt | 2 +- .../com/snowplowanalytics/core/emitter/Emitter.kt | 15 ++------------- .../snowplow/network/OkHttpNetworkConnection.kt | 2 +- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/snowplow-demo-compose/src/main/java/com/snowplowanalytics/snowplowdemocompose/data/Tracking.kt b/snowplow-demo-compose/src/main/java/com/snowplowanalytics/snowplowdemocompose/data/Tracking.kt index da8dd4b1e..5826dc451 100644 --- a/snowplow-demo-compose/src/main/java/com/snowplowanalytics/snowplowdemocompose/data/Tracking.kt +++ b/snowplow-demo-compose/src/main/java/com/snowplowanalytics/snowplowdemocompose/data/Tracking.kt @@ -20,7 +20,7 @@ object Tracking { @Composable fun setup(namespace: String) : TrackerController { // Replace this collector endpoint with your own - val networkConfig = NetworkConfiguration("https://23a6-82-26-43-253.ngrok.io", HttpMethod.POST) + val networkConfig = NetworkConfiguration("http://192.168.0.20:9090", HttpMethod.POST) val trackerConfig = TrackerConfiguration("appID") .logLevel(LogLevel.DEBUG) .screenViewAutotracking(false) diff --git a/snowplow-tracker/src/main/java/com/snowplowanalytics/core/emitter/Emitter.kt b/snowplow-tracker/src/main/java/com/snowplowanalytics/core/emitter/Emitter.kt index 220acef7a..04d518150 100755 --- a/snowplow-tracker/src/main/java/com/snowplowanalytics/core/emitter/Emitter.kt +++ b/snowplow-tracker/src/main/java/com/snowplowanalytics/core/emitter/Emitter.kt @@ -303,19 +303,8 @@ class Emitter( */ set(serverAnonymisation) { field = serverAnonymisation - if (!isCustomNetworkConnection && builderFinished) { - networkConnection = emitTimeout?.let { - OkHttpNetworkConnectionBuilder(uri, context) - .method(httpMethod) - .tls(tlsVersions) - .emitTimeout(it) - .customPostPath(customPostPath) - .client(client) - .cookieJar(cookieJar) - .serverAnonymisation(serverAnonymisation) - .requestHeaders(requestHeaders) - .build() - } + if (!isCustomNetworkConnection && builderFinished && networkConnection is OkHttpNetworkConnection) { + (networkConnection as OkHttpNetworkConnection).serverAnonymisation = true } } diff --git a/snowplow-tracker/src/main/java/com/snowplowanalytics/snowplow/network/OkHttpNetworkConnection.kt b/snowplow-tracker/src/main/java/com/snowplowanalytics/snowplow/network/OkHttpNetworkConnection.kt index 4b5631300..4092cc254 100644 --- a/snowplow-tracker/src/main/java/com/snowplowanalytics/snowplow/network/OkHttpNetworkConnection.kt +++ b/snowplow-tracker/src/main/java/com/snowplowanalytics/snowplow/network/OkHttpNetworkConnection.kt @@ -48,7 +48,7 @@ class OkHttpNetworkConnection private constructor(builder: OkHttpNetworkConnecti override val httpMethod: HttpMethod private val emitTimeout: Int private val customPostPath: String? - private val serverAnonymisation: Boolean + var serverAnonymisation: Boolean private val requestHeaders: Map? private var client: OkHttpClient? = null private val uriBuilder: Uri.Builder