wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename 'AccountSettings' to 'AccountSettingsDescriptions'

Browse source
This commit is contained in:
cketti 2020-04-10 01:41:39 +02:00
parent 6e6abe2e68
commit c5195890a1
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/core/src/main/java/com/fsck/k9/preferences/AccountSettings.java → app/core/src/main/java/com/fsck/k9/preferences/AccountSettingsDescriptions.java
View file

@ -37,7 +37,7 @@ import com.fsck.k9.preferences.Settings.StringSetting;
import com.fsck.k9.preferences.Settings.V;
public class AccountSettings {
public class AccountSettingsDescriptions {
static final Map<String, TreeMap<Integer, SettingsDescription>> SETTINGS;
private static final Map<Integer, SettingsUpgrader> UPGRADERS;

2
app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt
View file

@ -212,7 +212,7 @@ class SettingsExporter(
}
}
val versionedSetting = AccountSettings.SETTINGS[keyPart]
val versionedSetting = AccountSettingsDescriptions.SETTINGS[keyPart]
if (versionedSetting != null) {
val highestVersion = versionedSetting.lastKey()

8
app/core/src/main/java/com/fsck/k9/preferences/SettingsImporter.java
View file

@ -414,20 +414,20 @@ public class SettingsImporter {
// Validate account settings
Map<String, Object> validatedSettings =
AccountSettings.validate(contentVersion, account.settings.settings, !mergeImportedAccount);
AccountSettingsDescriptions.validate(contentVersion, account.settings.settings, !mergeImportedAccount);
// Upgrade account settings to current content version
if (contentVersion != Settings.VERSION) {
AccountSettings.upgrade(contentVersion, validatedSettings);
AccountSettingsDescriptions.upgrade(contentVersion, validatedSettings);
}
// Convert account settings to the string representation used in preference storage
Map<String, String> stringSettings = AccountSettings.convert(validatedSettings);
Map<String, String> stringSettings = AccountSettingsDescriptions.convert(validatedSettings);
// Merge account settings if necessary
Map<String, String> writeSettings;
if (mergeImportedAccount) {
writeSettings = new HashMap<>(AccountSettings.getAccountSettings(prefs.getStorage(), uuid));
writeSettings = new HashMap<>(AccountSettingsDescriptions.getAccountSettings(prefs.getStorage(), uuid));
writeSettings.putAll(stringSettings);
} else {
writeSettings = stringSettings;