Update `AccountSettingsUpgrader` to use constructor injection (9aea286d) · Commits · e / os / Mail

legacy/core/src/main/java/com/fsck/k9/preferences/AccountSettingsUpgrader.kt

+5 −4

Original line number	Diff line number	Diff line
		package com.fsck.k9.preferences

		internal class AccountSettingsUpgrader {
		private val identitySettingsUpgrader = IdentitySettingsUpgrader()
		private val folderSettingsUpgrader = FolderSettingsUpgrader()
		private val serverSettingsUpgrader = ServerSettingsUpgrader()
		internal class AccountSettingsUpgrader(
		private val identitySettingsUpgrader: IdentitySettingsUpgrader,
		private val folderSettingsUpgrader: FolderSettingsUpgrader,
		private val serverSettingsUpgrader: ServerSettingsUpgrader,
		) {

		fun upgrade(contentVersion: Int, account: ValidatedSettings.Account): ValidatedSettings.Account {
		if (contentVersion == Settings.VERSION) {

+13 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,19 @@ val preferencesModule = module {
		factory { GeneralSettingsWriter(preferences = get(), generalSettingsManager = get()) }

		factory { AccountSettingsValidator() }
		factory { AccountSettingsUpgrader() }

		factory { IdentitySettingsUpgrader() }
		factory { FolderSettingsUpgrader() }
		factory { ServerSettingsUpgrader() }

		factory {
		AccountSettingsUpgrader(
		identitySettingsUpgrader = get(),
		folderSettingsUpgrader = get(),
		serverSettingsUpgrader = get(),
		)
		}

		factory {
		AccountSettingsWriter(
		preferences = get(),