From 1df96fdb62207de5ce4660b1e2f506ca3c20641a Mon Sep 17 00:00:00 2001
From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com>
Date: Mon, 7 Apr 2025 16:03:53 -0400
Subject: [PATCH] [PM-19947] Provide system clock in the `core` module (#5000)

---
 .../data/platform/manager/di/PlatformManagerModule.kt        | 4 ----
 .../data/platform/manager/di/PlatformManagerModule.kt        | 5 -----
 core/src/main/kotlin/com/bitwarden/core/di/CoreModule.kt     | 5 +++++
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/PlatformManagerModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/PlatformManagerModule.kt
index fcc37e33be..775732b93c 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/PlatformManagerModule.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/di/PlatformManagerModule.kt
@@ -141,10 +141,6 @@ object PlatformManagerModule {
             vaultRepository = vaultRepository,
         )
 
-    @Provides
-    @Singleton
-    fun provideClock(): Clock = Clock.systemDefaultZone()
-
     @Provides
     @Singleton
     fun provideBiometricsEncryptionManager(
diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/di/PlatformManagerModule.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/di/PlatformManagerModule.kt
index 59fd5e216a..a3fb9467d1 100644
--- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/di/PlatformManagerModule.kt
+++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/manager/di/PlatformManagerModule.kt
@@ -28,7 +28,6 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import java.time.Clock
 import javax.inject.Singleton
 
 /**
@@ -52,10 +51,6 @@ object PlatformManagerModule {
     @Singleton
     fun provideSdkClientManager(): SdkClientManager = SdkClientManagerImpl()
 
-    @Provides
-    @Singleton
-    fun provideClock(): Clock = Clock.systemDefaultZone()
-
     @Provides
     @Singleton
     fun provideBiometricsEncryptionManager(
diff --git a/core/src/main/kotlin/com/bitwarden/core/di/CoreModule.kt b/core/src/main/kotlin/com/bitwarden/core/di/CoreModule.kt
index 4ae2fa38bd..421903cd10 100644
--- a/core/src/main/kotlin/com/bitwarden/core/di/CoreModule.kt
+++ b/core/src/main/kotlin/com/bitwarden/core/di/CoreModule.kt
@@ -8,6 +8,7 @@ import dagger.hilt.components.SingletonComponent
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.contextual
+import java.time.Clock
 import javax.inject.Singleton
 
 /**
@@ -35,4 +36,8 @@ object CoreModule {
         // Respect model default property values.
         coerceInputValues = true
     }
+
+    @Provides
+    @Singleton
+    fun provideClock(): Clock = Clock.systemDefaultZone()
 }