moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-28 04:02:19 -05:00
Code Issues Releases Wiki Activity

incremented preferences/Settings.VERSION for new settings

Browse Source
This commit is contained in:
ashley willis 2011-11-15 13:01:30 -06:00
parent 3ffb5021e1
commit 6a02552b23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/fsck/k9/preferences/AccountSettings.java
View File

@ -55,6 +55,7 @@ public class AccountSettings {
R.array.account_settings_message_age_values)); R.array.account_settings_message_age_values));
s.put("messageFormat", s.put("messageFormat",
new EnumSetting(Account.MessageFormat.class, Account.DEFAULT_MESSAGE_FORMAT)); new EnumSetting(Account.MessageFormat.class, Account.DEFAULT_MESSAGE_FORMAT));
s.put("messageFormatAuto", new BooleanSetting(Account.DEFAULT_MESSAGE_FORMAT_AUTO)); // added to version 2
s.put("messageReadReceipt", new BooleanSetting(Account.DEFAULT_MESSAGE_READ_RECEIPT)); s.put("messageReadReceipt", new BooleanSetting(Account.DEFAULT_MESSAGE_READ_RECEIPT));
s.put("notificationUnreadCount", new BooleanSetting(true)); s.put("notificationUnreadCount", new BooleanSetting(true));
s.put("notifyMailCheck", new BooleanSetting(false)); s.put("notifyMailCheck", new BooleanSetting(false));
@ -65,7 +66,7 @@ public class AccountSettings {
s.put("quoteStyle", s.put("quoteStyle",
new EnumSetting(Account.QuoteStyle.class, Account.DEFAULT_QUOTE_STYLE)); new EnumSetting(Account.QuoteStyle.class, Account.DEFAULT_QUOTE_STYLE));
s.put("replyAfterQuote", new BooleanSetting(Account.DEFAULT_REPLY_AFTER_QUOTE)); s.put("replyAfterQuote", new BooleanSetting(Account.DEFAULT_REPLY_AFTER_QUOTE));
//s.put("stripSignature", new BooleanSetting(Account.DEFAULT_STRIP_SIGNATURE)); // added to version 2 s.put("stripSignature", new BooleanSetting(Account.DEFAULT_STRIP_SIGNATURE)); // added to version 2
s.put("ring", new BooleanSetting(true)); s.put("ring", new BooleanSetting(true));
s.put("ringtone", new RingtoneSetting("content://settings/system/notification_sound")); s.put("ringtone", new RingtoneSetting("content://settings/system/notification_sound"));
s.put("saveAllHeaders", new BooleanSetting(true)); s.put("saveAllHeaders", new BooleanSetting(true));

2
src/com/fsck/k9/preferences/Settings.java
View File

@ -32,7 +32,7 @@ public class Settings {
* *
* @see SettingsExporter * @see SettingsExporter
*/ */
public static final int VERSION = 1; public static final int VERSION = 2;
public static Map<String, String> validate(Map<String, SettingsDescription> settings, public static Map<String, String> validate(Map<String, SettingsDescription> settings,
Map<String, String> importedSettings, boolean useDefaultValues) { Map<String, String> importedSettings, boolean useDefaultValues) {