Merge branch 'issue/parsely_tracker_kotlin_migration' into introduce_…

…binary_compatibility_validator
Parsely · Jan 15, 2024 · 884ed90 · 884ed90
2 parents 43453f3 + c2cb617
commit 884ed90
Show file tree

Hide file tree

Showing 7 changed files with 393 additions and 356 deletions.
diff --git a/parsely/src/androidTest/java/com/parsely/parselyandroid/FunctionalTests.kt b/parsely/src/androidTest/java/com/parsely/parselyandroid/FunctionalTests.kt
@@ -222,7 +222,7 @@ class FunctionalTests {
                 // when
                 startTimestamp = System.currentTimeMillis().milliseconds
                 parselyTracker.trackPageview("url")
-                parselyTracker.startEngagement(engagementUrl, null)
+                parselyTracker.startEngagement(engagementUrl)
             }
 
             Thread.sleep((firstInterval + secondInterval + pauseInterval).inWholeMilliseconds)
@@ -315,7 +315,7 @@ class FunctionalTests {
         activity: Activity,
         flushInterval: Duration = defaultFlushInterval
     ): ParselyTracker {
-        val field: Field = ParselyTracker::class.java.getDeclaredField("ROOT_URL")
+        val field: Field = ParselyTrackerInternal::class.java.getDeclaredField("ROOT_URL")
         field.isAccessible = true
         field.set(this, url)
         return ParselyTracker.sharedInstance(

diff --git a/parsely/src/main/java/com/parsely/parselyandroid/EngagementManager.kt b/parsely/src/main/java/com/parsely/parselyandroid/EngagementManager.kt
@@ -19,7 +19,7 @@ import kotlinx.coroutines.launch
  * 2. Progressive backoff for long engagements to save data.
  */
 internal class EngagementManager(
-    private val parselyTracker: ParselyTracker,
+    private val eventQueuer: EventQueuer,
     private var latestDelayMillis: Long,
     private val baseEvent: Map<String, Any>,
     private val intervalCalculator: HeartbeatIntervalCalculator,
@@ -76,7 +76,7 @@ internal class EngagementManager(
         totalTime += inc
         event["inc"] = inc / 1000
         event["tt"] = totalTime
-        parselyTracker.enqueueEvent(event)
+        eventQueuer.enqueueEvent(event)
     }
 
     val intervalMillis: Double

diff --git a/parsely/src/main/java/com/parsely/parselyandroid/EventQueuer.kt b/parsely/src/main/java/com/parsely/parselyandroid/EventQueuer.kt
@@ -0,0 +1,5 @@
+package com.parsely.parselyandroid
+
+internal interface EventQueuer {
+    fun enqueueEvent(event: Map<String, Any>)
+}
diff --git a/parsely/src/main/java/com/parsely/parselyandroid/FlushQueue.kt b/parsely/src/main/java/com/parsely/parselyandroid/FlushQueue.kt
@@ -39,7 +39,7 @@ internal class FlushQueue(
                 log("Sending request with %d events", eventsToSend.size)
                 val jsonPayload = toParselyEventsPayload(eventsToSend)
                 log("POST Data %s", jsonPayload)
-                log("Requested %s", ParselyTracker.ROOT_URL)
+                log("Requested %s", ParselyTrackerInternal.ROOT_URL)
                 restClient.send(jsonPayload)
                     .fold(
                         onSuccess = {