mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-20 04:02:14 +02:00
Code

Extract code to validate general settings

Browse Source
This commit is contained in:
cketti 2024-06-12 18:06:44 +02:00
parent e72929748c
commit b9c1ac9e81
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsValidator.kt Normal file
View File

@ -0,0 +1,9 @@
package com.fsck.k9.preferences
internal typealias InternalSettingsMap = Map<String, Any>
internal class GeneralSettingsValidator {
fun validate(contentVersion: Int, settings: SettingsMap): InternalSettingsMap {
return GeneralSettingsDescriptions.validate(contentVersion, settings)
}
}

5
app/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.kt
View File

@ -38,6 +38,8 @@ class SettingsImporter internal constructor(
private val clock: Clock,
private val context: Context,
) {
private val generalSettingsValidator = GeneralSettingsValidator()
/**
* Parses an import [InputStream] and returns information on whether it contains global settings and/or account
* settings. For all account configurations found, the name of the account along with the account UUID is returned.
@ -227,8 +229,7 @@ class SettingsImporter internal constructor(
contentVersion: Int,
settings: SettingsMap,
) {
// Validate global settings
val validatedSettings = GeneralSettingsDescriptions.validate(contentVersion, settings)
val validatedSettings = generalSettingsValidator.validate(contentVersion, settings).toMutableMap()
// Upgrade global settings to current content version
if (contentVersion != Settings.VERSION) {