moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-17 07:30:16 -05:00
Code Issues Releases Wiki Activity

Export default value for keys not found in preference storage

Browse Source
This commit is contained in:
cketti 2011-10-26 05:13:22 +02:00
parent afd355f83c
commit ae465789b7
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/fsck/k9/preferences/SettingsExporter.java
View File

@ -168,16 +168,27 @@ public class SettingsExporter {
Map<String, Object> prefs) throws IOException { Map<String, Object> prefs) throws IOException {
for (String key : GlobalSettings.SETTINGS.keySet()) { for (String key : GlobalSettings.SETTINGS.keySet()) {
String valueString = prefs.get(key).toString(); String valueString = (String) prefs.get(key);
if (valueString != null) {
try {
SettingsDescription setting = GlobalSettings.SETTINGS.get(key);
Object value = setting.fromString(valueString);
String outputValue = setting.toPrettyString(value);
writeKeyValue(serializer, key, outputValue);
} catch (InvalidSettingValueException e) {
Log.w(K9.LOG_TAG, "Global setting \"" + key + "\" has invalid value \"" +
valueString + "\" in preference storage. This shouldn't happen!");
}
} else {
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "Couldn't find key \"" + key + "\" in preference storage." +
"Using default value.");
}
try {
SettingsDescription setting = GlobalSettings.SETTINGS.get(key); SettingsDescription setting = GlobalSettings.SETTINGS.get(key);
Object value = setting.fromString(valueString); Object value = setting.getDefaultValue();
String outputValue = setting.toPrettyString(value); String outputValue = setting.toPrettyString(value);
writeKeyValue(serializer, key, outputValue); writeKeyValue(serializer, key, outputValue);
} catch (InvalidSettingValueException e) {
Log.w(K9.LOG_TAG, "Global setting \"" + key + "\" has invalid value \"" +
valueString + "\" in preference storage. This shouldn't happen!");
} }
} }
} }