Rely on true time instead of the system clock

tidal-music · Jun 11, 2024 · 289f5a2 · 289f5a2
1 parent ed8b134
commit 289f5a2
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/eventproducer/build.gradle.kts b/eventproducer/build.gradle.kts
@@ -27,6 +27,7 @@ dependencies {
     implementation(libs.tickaroo.annotation)
     implementation(libs.tickaroo.core)
     implementation(libs.tickaroo.retrofitConverter)
+    implementation(libs.truetime)
 
     ksp(libs.dagger.compiler)
     kapt(libs.room.compiler)

diff --git a/eventproducer/src/main/kotlin/com/tidal/sdk/eventproducer/di/UtilsModule.kt b/eventproducer/src/main/kotlin/com/tidal/sdk/eventproducer/di/UtilsModule.kt
@@ -3,8 +3,10 @@ package com.tidal.sdk.eventproducer.di
 import com.tidal.sdk.auth.CredentialsProvider
 import com.tidal.sdk.eventproducer.model.EventsConfigProvider
 import com.tidal.sdk.eventproducer.utils.HeadersUtils
+import com.tidal.sdk.eventproducer.utils.TrueTimeWrapper
 import dagger.Module
 import dagger.Provides
+import dagger.Reusable
 
 @Module
 internal class UtilsModule {
@@ -13,5 +15,10 @@ internal class UtilsModule {
     fun provideHeadersUtils(
         configProvider: EventsConfigProvider,
         credentialsProvider: CredentialsProvider,
-    ) = HeadersUtils(configProvider.config.appVersion, credentialsProvider)
+        trueTimeWrapper: TrueTimeWrapper,
+    ) = HeadersUtils(configProvider.config.appVersion, credentialsProvider, trueTimeWrapper)
+
+    @Provides
+    @Reusable
+    fun provideTrueTimeWrapper() = TrueTimeWrapper()
 }
diff --git a/eventproducer/src/main/kotlin/com/tidal/sdk/eventproducer/utils/HeadersUtils.kt b/eventproducer/src/main/kotlin/com/tidal/sdk/eventproducer/utils/HeadersUtils.kt
@@ -19,6 +19,7 @@ internal const val DEVICE_VENDOR_KEY = "device-vendor"
 internal class HeadersUtils @Inject constructor(
     private val appVersion: String,
     private val credentialsProvider: CredentialsProvider,
+    private val trueTimeWrapper: TrueTimeWrapper,
 ) {
     fun getEventHeaders(
         defaultHeaders: Map<String, String>,
@@ -31,7 +32,7 @@ internal class HeadersUtils @Inject constructor(
     ): Map<String, String> {
         val deviceModel = Build.MODEL
         val deviceVendor = Build.MANUFACTURER
-        val sentTimestamp = System.currentTimeMillis().toString()
+        val sentTimestamp = trueTimeWrapper.currentTimeMillis.toString()
         val osName = "Android"
         val osVersion = Build.VERSION.SDK_INT.toString()
         val headers = mutableMapOf<String, String>()

diff --git a/eventproducer/src/main/kotlin/com/tidal/sdk/eventproducer/utils/TrueTimeWrapper.kt b/eventproducer/src/main/kotlin/com/tidal/sdk/eventproducer/utils/TrueTimeWrapper.kt
@@ -0,0 +1,13 @@
+package com.tidal.sdk.eventproducer.utils
+
+import com.instacart.library.truetime.TrueTime
+
+class TrueTimeWrapper {
+
+    val currentTimeMillis: Long
+        get() = try {
+            TrueTime.now().time
+        } catch (_: Throwable) {
+            System.currentTimeMillis()
+        }
+}
diff --git a/eventproducer/src/test/kotlin/com/tidal/eventproducer/utils/HeadersUtilsTest.kt b/eventproducer/src/test/kotlin/com/tidal/eventproducer/utils/HeadersUtilsTest.kt
@@ -7,6 +7,8 @@ import com.tidal.sdk.eventproducer.utils.APP_VERSION_KEY
 import com.tidal.sdk.eventproducer.utils.CLIENT_ID_KEY
 import com.tidal.sdk.eventproducer.utils.HeadersUtils
 import com.tidal.sdk.eventproducer.utils.OS_NAME_KEY
+import com.tidal.sdk.eventproducer.utils.TrueTimeWrapper
+import io.mockk.mockk
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
@@ -15,6 +17,7 @@ class HeadersUtilsTest {
     private val headerUtils = HeadersUtils(
         "",
         FakeCredentialsProvider(),
+        mockk<TrueTimeWrapper>(),
     )
 
     @Test