From 6668af58d224d061aaae84a6847df2b73b5f8465 Mon Sep 17 00:00:00 2001
From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com>
Date: Tue, 8 Apr 2025 12:03:04 -0400
Subject: [PATCH] [PM-19949] Provide ConfigDiskSource from `data` module
 (#5003)

---
 .../datasource/disk/di/PlatformDiskModule.kt  | 13 ---------
 .../datasource/disk/di/PlatformDiskModule.kt  | 14 ---------
 .../datasource/disk/ConfigDiskSourceImpl.kt   |  2 +-
 .../data/datasource/disk/di/DiskModule.kt     | 29 +++++++++++++++++++
 4 files changed, 30 insertions(+), 28 deletions(-)
 create mode 100644 data/src/main/kotlin/com/bitwarden/data/datasource/disk/di/DiskModule.kt

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt
index 274c8592c2..449c5f9aff 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/di/PlatformDiskModule.kt
@@ -5,8 +5,6 @@ import android.content.Context
 import android.content.SharedPreferences
 import androidx.room.Room
 import com.bitwarden.data.datasource.di.EncryptedPreferences
-import com.bitwarden.data.datasource.disk.ConfigDiskSource
-import com.bitwarden.data.datasource.disk.ConfigDiskSourceImpl
 import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences
 import com.bitwarden.data.manager.DispatcherManager
 import com.x8bit.bitwarden.data.platform.datasource.disk.EnvironmentDiskSource
@@ -57,17 +55,6 @@ object PlatformDiskModule {
             json = json,
         )
 
-    @Provides
-    @Singleton
-    fun provideConfigDiskSource(
-        @UnencryptedPreferences sharedPreferences: SharedPreferences,
-        json: Json,
-    ): ConfigDiskSource =
-        ConfigDiskSourceImpl(
-            sharedPreferences = sharedPreferences,
-            json = json,
-        )
-
     @Provides
     @Singleton
     fun provideEventDatabase(
diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/di/PlatformDiskModule.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/di/PlatformDiskModule.kt
index eb6de53b21..fab3efe20b 100644
--- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/di/PlatformDiskModule.kt
+++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/disk/di/PlatformDiskModule.kt
@@ -5,14 +5,11 @@ import com.bitwarden.authenticator.data.platform.datasource.disk.FeatureFlagOver
 import com.bitwarden.authenticator.data.platform.datasource.disk.FeatureFlagOverrideDiskSourceImpl
 import com.bitwarden.authenticator.data.platform.datasource.disk.SettingsDiskSource
 import com.bitwarden.authenticator.data.platform.datasource.disk.SettingsDiskSourceImpl
-import com.bitwarden.data.datasource.disk.ConfigDiskSource
-import com.bitwarden.data.datasource.disk.ConfigDiskSourceImpl
 import com.bitwarden.data.datasource.disk.di.UnencryptedPreferences
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import kotlinx.serialization.json.Json
 import javax.inject.Singleton
 
 @Module
@@ -22,17 +19,6 @@ import javax.inject.Singleton
  */
 object PlatformDiskModule {
 
-    @Provides
-    @Singleton
-    fun provideConfigDiskSource(
-        @UnencryptedPreferences sharedPreferences: SharedPreferences,
-        json: Json,
-    ): ConfigDiskSource =
-        ConfigDiskSourceImpl(
-            sharedPreferences = sharedPreferences,
-            json = json,
-        )
-
     @Provides
     @Singleton
     fun provideSettingsDiskSource(
diff --git a/data/src/main/kotlin/com/bitwarden/data/datasource/disk/ConfigDiskSourceImpl.kt b/data/src/main/kotlin/com/bitwarden/data/datasource/disk/ConfigDiskSourceImpl.kt
index 2d88d19f6b..570e939fe9 100644
--- a/data/src/main/kotlin/com/bitwarden/data/datasource/disk/ConfigDiskSourceImpl.kt
+++ b/data/src/main/kotlin/com/bitwarden/data/datasource/disk/ConfigDiskSourceImpl.kt
@@ -13,7 +13,7 @@ private const val SERVER_CONFIGURATIONS = "serverConfigurations"
 /**
  * Primary implementation of [ConfigDiskSource].
  */
-class ConfigDiskSourceImpl(
+internal class ConfigDiskSourceImpl(
     sharedPreferences: SharedPreferences,
     private val json: Json,
 ) : BaseDiskSource(sharedPreferences = sharedPreferences),
diff --git a/data/src/main/kotlin/com/bitwarden/data/datasource/disk/di/DiskModule.kt b/data/src/main/kotlin/com/bitwarden/data/datasource/disk/di/DiskModule.kt
new file mode 100644
index 0000000000..9af18332b7
--- /dev/null
+++ b/data/src/main/kotlin/com/bitwarden/data/datasource/disk/di/DiskModule.kt
@@ -0,0 +1,29 @@
+package com.bitwarden.data.datasource.disk.di
+
+import android.content.SharedPreferences
+import com.bitwarden.data.datasource.disk.ConfigDiskSource
+import com.bitwarden.data.datasource.disk.ConfigDiskSourceImpl
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.serialization.json.Json
+import javax.inject.Singleton
+
+/**
+ * Provides persistence-related dependencies in the data module.
+ */
+@Module
+@InstallIn(SingletonComponent::class)
+object DiskModule {
+    @Provides
+    @Singleton
+    fun provideConfigDiskSource(
+        @UnencryptedPreferences sharedPreferences: SharedPreferences,
+        json: Json,
+    ): ConfigDiskSource =
+        ConfigDiskSourceImpl(
+            sharedPreferences = sharedPreferences,
+            json = json,
+        )
+}