refactor: injected StoragePersister in PreferenceManager<T> implementation

shamim-emon · shamim-emon · commit 6b507e0b02a0 · 2025-12-06T00:08:08.000+06:00
diff --git a/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/debugging/DefaultDebuggingSettingsPreferenceManager.kt b/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/debugging/DefaultDebuggingSettingsPreferenceManager.kt
@@ -16,12 +16,13 @@ import net.thunderbird.core.logging.LogLevelManager
 import net.thunderbird.core.logging.Logger
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.core.preference.storage.StorageEditor
+import net.thunderbird.core.preference.storage.StoragePersister
 
 private const val TAG = "DefaultDebuggingSettingsPreferenceManager"
 
 class DefaultDebuggingSettingsPreferenceManager(
     private val logger: Logger,
-    private val storage: Storage,
+    private val storagePersister: StoragePersister,
     private val storageEditor: StorageEditor,
     private val logLevelManager: LogLevelManager,
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
@@ -30,6 +31,8 @@ class DefaultDebuggingSettingsPreferenceManager(
 ) : DebuggingSettingsPreferenceManager {
     private val configState: MutableStateFlow<DebuggingSettings> = MutableStateFlow(value = loadConfig())
     private val mutex = Mutex()
+    private val storage: Storage
+        get() = storagePersister.loadValues()
 
     override fun getConfig(): DebuggingSettings = configState.value
     override fun getConfigFlow(): Flow<DebuggingSettings> = configState
diff --git a/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/coreSettings/DefaultDisplayCoreSettingsPreferenceManager.kt b/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/coreSettings/DefaultDisplayCoreSettingsPreferenceManager.kt
@@ -13,21 +13,24 @@ import kotlinx.coroutines.sync.withLock
 import net.thunderbird.core.logging.Logger
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.core.preference.storage.StorageEditor
+import net.thunderbird.core.preference.storage.StoragePersister
 import net.thunderbird.core.preference.storage.getEnumOrDefault
 import net.thunderbird.core.preference.storage.putEnum
 
 private const val TAG = "DefaultDisplayCoreSettingsPreferenceManager"
 
 class DefaultDisplayCoreSettingsPreferenceManager(
     private val logger: Logger,
-    private val storage: Storage,
+    private val storagePersister: StoragePersister,
     private val storageEditor: StorageEditor,
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
     private var scope: CoroutineScope = CoroutineScope(SupervisorJob()),
 ) : DisplayCoreSettingsPreferenceManager {
 
     private val configState: MutableStateFlow<DisplayCoreSettings> = MutableStateFlow(value = loadConfig())
     private val mutex = Mutex()
+    private val storage: Storage
+        get() = storagePersister.loadValues()
 
     override fun getConfig(): DisplayCoreSettings = configState.value
 
diff --git a/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/inboxSettings/DefaultDisplayInboxSettingsPreferenceManager.kt b/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/inboxSettings/DefaultDisplayInboxSettingsPreferenceManager.kt
@@ -13,19 +13,22 @@ import kotlinx.coroutines.sync.withLock
 import net.thunderbird.core.logging.Logger
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.core.preference.storage.StorageEditor
+import net.thunderbird.core.preference.storage.StoragePersister
 
 private const val TAG = "DefaultDisplayInboxSettingsPreferenceManager"
 
 class DefaultDisplayInboxSettingsPreferenceManager(
     private val logger: Logger,
-    private val storage: Storage,
+    private val storagePersister: StoragePersister,
     private val storageEditor: StorageEditor,
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
     private var scope: CoroutineScope = CoroutineScope(SupervisorJob()),
 ) : DisplayInboxSettingsPreferenceManager {
 
     private val configState: MutableStateFlow<DisplayInboxSettings> = MutableStateFlow(value = loadConfig())
     private val mutex = Mutex()
+    private val storage: Storage
+        get() = storagePersister.loadValues()
 
     override fun getConfig(): DisplayInboxSettings = configState.value
 
diff --git a/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/miscSettings/DefaultDisplayMiscSettingsPreferenceManager.kt b/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/miscSettings/DefaultDisplayMiscSettingsPreferenceManager.kt
@@ -13,18 +13,21 @@ import kotlinx.coroutines.sync.withLock
 import net.thunderbird.core.logging.Logger
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.core.preference.storage.StorageEditor
+import net.thunderbird.core.preference.storage.StoragePersister
 
 private const val TAG = "DefaultDisplayMiscSettingsPreferenceManager"
 
 class DefaultDisplayMiscSettingsPreferenceManager(
     private val logger: Logger,
-    private val storage: Storage,
+    private val storagePersister: StoragePersister,
     private val storageEditor: StorageEditor,
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
     private var scope: CoroutineScope = CoroutineScope(SupervisorJob()),
 ) : DisplayMiscSettingsPreferenceManager {
     private val configState: MutableStateFlow<DisplayMiscSettings> = MutableStateFlow(value = loadConfig())
     private val mutex = Mutex()
+    private val storage: Storage
+        get() = storagePersister.loadValues()
     override fun save(config: DisplayMiscSettings) {
         logger.debug(TAG) { "save() called with: config = $config" }
         writeConfig(config)
diff --git a/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DefaultDisplayVisualSettingsPreferenceManager.kt b/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/display/visualSettings/DefaultDisplayVisualSettingsPreferenceManager.kt
@@ -18,14 +18,15 @@ import net.thunderbird.core.logging.Logger
 import net.thunderbird.core.preference.display.visualSettings.message.list.MessageListPreferencesManager
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.core.preference.storage.StorageEditor
+import net.thunderbird.core.preference.storage.StoragePersister
 import net.thunderbird.core.preference.storage.getEnumOrDefault
 import net.thunderbird.core.preference.storage.putEnum
 
 private const val TAG = "DefaultDisplayVisualSettingsPreferenceManager"
 
 class DefaultDisplayVisualSettingsPreferenceManager(
     private val logger: Logger,
-    private val storage: Storage,
+    private val storagePersister: StoragePersister,
     private val storageEditor: StorageEditor,
     private val messageListPreferences: MessageListPreferencesManager,
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
@@ -39,6 +40,8 @@ class DefaultDisplayVisualSettingsPreferenceManager(
         config.copy(messageListSettings = messageListConfig)
     }.stateIn(scope = scope, started = SharingStarted.Eagerly, initialValue = internalConfigState.value)
     private val mutex = Mutex()
+    private val storage: Storage
+        get() = storagePersister.loadValues()
 
     override fun save(config: DisplayVisualSettings) {
         logger.debug(TAG) { "save() called with: config = $config" }
diff --git a/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/interaction/DefaultInteractionSettingsPreferenceManager.kt b/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/interaction/DefaultInteractionSettingsPreferenceManager.kt
@@ -14,21 +14,25 @@ import net.thunderbird.core.common.action.SwipeActions
 import net.thunderbird.core.logging.Logger
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.core.preference.storage.StorageEditor
+import net.thunderbird.core.preference.storage.StoragePersister
 import net.thunderbird.core.preference.storage.getEnumOrDefault
 import net.thunderbird.core.preference.storage.putEnum
 
 private const val TAG = "DefaultInteractionSettingsPreferenceManager"
 
 class DefaultInteractionSettingsPreferenceManager(
     private val logger: Logger,
-    private val storage: Storage,
+    private val storagePersister: StoragePersister,
     private val storageEditor: StorageEditor,
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
     private var scope: CoroutineScope = CoroutineScope(SupervisorJob()),
 ) : InteractionSettingsPreferenceManager {
     private val configState: MutableStateFlow<InteractionSettings> = MutableStateFlow(value = loadConfig())
     private val mutex = Mutex()
 
+    private val storage: Storage
+        get() = storagePersister.loadValues()
+
     override fun getConfig(): InteractionSettings = configState.value
     override fun getConfigFlow(): Flow<InteractionSettings> = configState
 
diff --git a/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/network/DefaultNetworkSettingsPreferenceManager.kt b/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/network/DefaultNetworkSettingsPreferenceManager.kt
@@ -13,20 +13,23 @@ import kotlinx.coroutines.sync.withLock
 import net.thunderbird.core.logging.Logger
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.core.preference.storage.StorageEditor
+import net.thunderbird.core.preference.storage.StoragePersister
 import net.thunderbird.core.preference.storage.getEnumOrDefault
 import net.thunderbird.core.preference.storage.putEnum
 
 private const val TAG = "DefaultNetworkSettingsPreferenceManager"
 
 class DefaultNetworkSettingsPreferenceManager(
     private val logger: Logger,
-    private val storage: Storage,
+    private val storagePersister: StoragePersister,
     private val storageEditor: StorageEditor,
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
     private var scope: CoroutineScope = CoroutineScope(SupervisorJob()),
 ) : NetworkSettingsPreferenceManager {
     private val configState: MutableStateFlow<NetworkSettings> = MutableStateFlow(value = loadConfig())
     private val mutex = Mutex()
+    private val storage: Storage
+        get() = storagePersister.loadValues()
 
     override fun getConfig(): NetworkSettings = configState.value
     override fun getConfigFlow(): Flow<NetworkSettings> = configState
diff --git a/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/notification/DefaultNotificationPreferenceManager.kt b/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/notification/DefaultNotificationPreferenceManager.kt
@@ -13,17 +13,20 @@ import kotlinx.coroutines.sync.withLock
 import net.thunderbird.core.logging.Logger
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.core.preference.storage.StorageEditor
+import net.thunderbird.core.preference.storage.StoragePersister
 
 private const val TAG = "DefaultNotificationPreferenceManager"
 
 class DefaultNotificationPreferenceManager(
     private val logger: Logger,
-    storage: Storage,
+    private val storagePersister: StoragePersister,
     private val storageEditor: StorageEditor,
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
     private var scope: CoroutineScope = CoroutineScope(SupervisorJob()),
 ) : NotificationPreferenceManager {
     private val mutex = Mutex()
+    private val storage: Storage
+        get() = storagePersister.loadValues()
     private val configState = MutableStateFlow(
         value = NotificationPreference(
             isQuietTimeEnabled = storage.getBoolean(
diff --git a/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/privacy/DefaultPrivacySettingsPreferenceManager.kt b/core/preference/impl/src/commonMain/kotlin/net/thunderbird/core/preference/privacy/DefaultPrivacySettingsPreferenceManager.kt
@@ -13,18 +13,21 @@ import kotlinx.coroutines.sync.withLock
 import net.thunderbird.core.logging.Logger
 import net.thunderbird.core.preference.storage.Storage
 import net.thunderbird.core.preference.storage.StorageEditor
+import net.thunderbird.core.preference.storage.StoragePersister
 
 private const val TAG = "DefaultPrivacySettingsPreferenceManager"
 
 class DefaultPrivacySettingsPreferenceManager(
     private val logger: Logger,
-    private val storage: Storage,
+    private val storagePersister: StoragePersister,
     private val storageEditor: StorageEditor,
     private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
     private var scope: CoroutineScope = CoroutineScope(SupervisorJob()),
 ) : PrivacySettingsPreferenceManager {
     private val configState: MutableStateFlow<PrivacySettings> = MutableStateFlow(value = loadConfig())
     private val mutex = Mutex()
+    private val storage: Storage
+        get() = storagePersister.loadValues()
 
     override fun getConfig(): PrivacySettings = configState.value
     override fun getConfigFlow(): Flow<PrivacySettings> = configState
diff --git a/legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt b/legacy/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt
@@ -52,50 +52,50 @@ val preferencesModule = module {
     single<PrivacySettingsPreferenceManager> {
         DefaultPrivacySettingsPreferenceManager(
             logger = get(),
-            storage = get<Preferences>().storage,
+            storagePersister = get(),
             storageEditor = get<Preferences>().createStorageEditor(),
         )
     }
     single<NotificationPreferenceManager> {
         DefaultNotificationPreferenceManager(
             logger = get(),
-            storage = get<Preferences>().storage,
+            storagePersister = get(),
             storageEditor = get<Preferences>().createStorageEditor(),
         )
     }
     single<DisplayCoreSettingsPreferenceManager> {
         DefaultDisplayCoreSettingsPreferenceManager(
             logger = get(),
-            storage = get<Preferences>().storage,
+            storagePersister = get(),
             storageEditor = get<Preferences>().createStorageEditor(),
         )
     }
     single<DisplayInboxSettingsPreferenceManager> {
         DefaultDisplayInboxSettingsPreferenceManager(
             logger = get(),
-            storage = get<Preferences>().storage,
+            storagePersister = get(),
             storageEditor = get<Preferences>().createStorageEditor(),
         )
     }
     single<DisplayVisualSettingsPreferenceManager> {
         DefaultDisplayVisualSettingsPreferenceManager(
             logger = get(),
-            storage = get<Preferences>().storage,
+            storagePersister = get(),
             storageEditor = get<Preferences>().createStorageEditor(),
             messageListPreferences = get(),
         )
     }
     single<DisplayMiscSettingsPreferenceManager> {
         DefaultDisplayMiscSettingsPreferenceManager(
             logger = get(),
-            storage = get<Preferences>().storage,
+            storagePersister = get(),
             storageEditor = get<Preferences>().createStorageEditor(),
         )
     }
     single<InteractionSettingsPreferenceManager> {
         DefaultInteractionSettingsPreferenceManager(
             logger = get(),
-            storage = get<Preferences>().storage,
+            storagePersister = get(),
             storageEditor = get<Preferences>().createStorageEditor(),
         )
     }
@@ -118,14 +118,14 @@ val preferencesModule = module {
     single<NetworkSettingsPreferenceManager> {
         DefaultNetworkSettingsPreferenceManager(
             logger = get(),
-            storage = get<Preferences>().storage,
+            storagePersister = get(),
             storageEditor = get<Preferences>().createStorageEditor(),
         )
     }
     single<DebuggingSettingsPreferenceManager> {
         DefaultDebuggingSettingsPreferenceManager(
             logger = get(),
-            storage = get<Preferences>().storage,
+            storagePersister = get(),
             storageEditor = get<Preferences>().createStorageEditor(),
             logLevelManager = get(),
             platformConfigProvider = get(),

Original file line number	Diff line number	Diff line change
`@@ -52,50 +52,50 @@ val preferencesModule = module {`
`52`	`52`	`single<PrivacySettingsPreferenceManager> {`
`53`	`53`	`DefaultPrivacySettingsPreferenceManager(`
`54`	`54`	`logger = get(),`
`55`		`- storage = get<Preferences>().storage,`
	`55`	`+ storagePersister = get(),`
`56`	`56`	`storageEditor = get<Preferences>().createStorageEditor(),`
`57`	`57`	`)`
`58`	`58`	`}`
`59`	`59`	`single<NotificationPreferenceManager> {`
`60`	`60`	`DefaultNotificationPreferenceManager(`
`61`	`61`	`logger = get(),`
`62`		`- storage = get<Preferences>().storage,`
	`62`	`+ storagePersister = get(),`
`63`	`63`	`storageEditor = get<Preferences>().createStorageEditor(),`
`64`	`64`	`)`
`65`	`65`	`}`
`66`	`66`	`single<DisplayCoreSettingsPreferenceManager> {`
`67`	`67`	`DefaultDisplayCoreSettingsPreferenceManager(`
`68`	`68`	`logger = get(),`
`69`		`- storage = get<Preferences>().storage,`
	`69`	`+ storagePersister = get(),`
`70`	`70`	`storageEditor = get<Preferences>().createStorageEditor(),`
`71`	`71`	`)`
`72`	`72`	`}`
`73`	`73`	`single<DisplayInboxSettingsPreferenceManager> {`
`74`	`74`	`DefaultDisplayInboxSettingsPreferenceManager(`
`75`	`75`	`logger = get(),`
`76`		`- storage = get<Preferences>().storage,`
	`76`	`+ storagePersister = get(),`
`77`	`77`	`storageEditor = get<Preferences>().createStorageEditor(),`
`78`	`78`	`)`
`79`	`79`	`}`
`80`	`80`	`single<DisplayVisualSettingsPreferenceManager> {`
`81`	`81`	`DefaultDisplayVisualSettingsPreferenceManager(`
`82`	`82`	`logger = get(),`
`83`		`- storage = get<Preferences>().storage,`
	`83`	`+ storagePersister = get(),`
`84`	`84`	`storageEditor = get<Preferences>().createStorageEditor(),`
`85`	`85`	`messageListPreferences = get(),`
`86`	`86`	`)`
`87`	`87`	`}`
`88`	`88`	`single<DisplayMiscSettingsPreferenceManager> {`
`89`	`89`	`DefaultDisplayMiscSettingsPreferenceManager(`
`90`	`90`	`logger = get(),`
`91`		`- storage = get<Preferences>().storage,`
	`91`	`+ storagePersister = get(),`
`92`	`92`	`storageEditor = get<Preferences>().createStorageEditor(),`
`93`	`93`	`)`
`94`	`94`	`}`
`95`	`95`	`single<InteractionSettingsPreferenceManager> {`
`96`	`96`	`DefaultInteractionSettingsPreferenceManager(`
`97`	`97`	`logger = get(),`
`98`		`- storage = get<Preferences>().storage,`
	`98`	`+ storagePersister = get(),`
`99`	`99`	`storageEditor = get<Preferences>().createStorageEditor(),`
`100`	`100`	`)`
`101`	`101`	`}`
`@@ -118,14 +118,14 @@ val preferencesModule = module {`
`118`	`118`	`single<NetworkSettingsPreferenceManager> {`
`119`	`119`	`DefaultNetworkSettingsPreferenceManager(`
`120`	`120`	`logger = get(),`
`121`		`- storage = get<Preferences>().storage,`
	`121`	`+ storagePersister = get(),`
`122`	`122`	`storageEditor = get<Preferences>().createStorageEditor(),`
`123`	`123`	`)`
`124`	`124`	`}`
`125`	`125`	`single<DebuggingSettingsPreferenceManager> {`
`126`	`126`	`DefaultDebuggingSettingsPreferenceManager(`
`127`	`127`	`logger = get(),`
`128`		`- storage = get<Preferences>().storage,`
	`128`	`+ storagePersister = get(),`
`129`	`129`	`storageEditor = get<Preferences>().createStorageEditor(),`
`130`	`130`	`logLevelManager = get(),`
`131`	`131`	`platformConfigProvider = get(),`