mirror of
https://github.com/moparisthebest/k-9
synced 2024-12-24 08:38:51 -05:00
capitalization and change of variable names.
This commit is contained in:
parent
994f474aae
commit
6694f637e3
@ -568,7 +568,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
|
||||
<string name="account_settings_message_format_label">Message Format</string>
|
||||
<string name="account_settings_message_format_text">Plain Text (images and formatting will be removed)</string>
|
||||
<string name="account_settings_message_format_html">HTML (images and formatting are preserved)</string>
|
||||
<string name="account_settings_message_format_auto">Automatic (plain text unless replying to an html message)</string>
|
||||
<string name="account_settings_message_format_auto">Automatic (plain text unless replying to an HTML message)</string>
|
||||
|
||||
<string name="account_settings_message_read_receipt_label">Read receipt</string>
|
||||
<string name="account_settings_message_read_receipt_summary">Always request a read receipt</string>
|
||||
|
@ -60,7 +60,7 @@ public class Account implements BaseAccount {
|
||||
private static final String[] networkTypes = { TYPE_WIFI, TYPE_MOBILE, TYPE_OTHER };
|
||||
|
||||
public static final MessageFormat DEFAULT_MESSAGE_FORMAT = MessageFormat.HTML;
|
||||
public static final boolean DEFAULT_AUTO_MESSAGE_FORMAT = false;
|
||||
public static final boolean DEFAULT_MESSAGE_FORMAT_AUTO = false;
|
||||
public static final boolean DEFAULT_MESSAGE_READ_RECEIPT = false;
|
||||
public static final QuoteStyle DEFAULT_QUOTE_STYLE = QuoteStyle.PREFIX;
|
||||
public static final String DEFAULT_QUOTE_PREFIX = ">";
|
||||
@ -138,7 +138,7 @@ public class Account implements BaseAccount {
|
||||
// current set of fetched messages
|
||||
private boolean mRingNotified;
|
||||
private MessageFormat mMessageFormat;
|
||||
private boolean mAutoMessageFormat;
|
||||
private boolean mMessageFormatAuto;
|
||||
private boolean mMessageReadReceipt;
|
||||
private QuoteStyle mQuoteStyle;
|
||||
private String mQuotePrefix;
|
||||
@ -228,7 +228,7 @@ public class Account implements BaseAccount {
|
||||
maximumPolledMessageAge = -1;
|
||||
maximumAutoDownloadMessageSize = 32768;
|
||||
mMessageFormat = DEFAULT_MESSAGE_FORMAT;
|
||||
mAutoMessageFormat = DEFAULT_AUTO_MESSAGE_FORMAT;
|
||||
mMessageFormatAuto = DEFAULT_MESSAGE_FORMAT_AUTO;
|
||||
mMessageReadReceipt = DEFAULT_MESSAGE_READ_RECEIPT;
|
||||
mQuoteStyle = DEFAULT_QUOTE_STYLE;
|
||||
mQuotePrefix = DEFAULT_QUOTE_PREFIX;
|
||||
@ -305,8 +305,8 @@ public class Account implements BaseAccount {
|
||||
maximumPolledMessageAge = prefs.getInt(mUuid + ".maximumPolledMessageAge", -1);
|
||||
maximumAutoDownloadMessageSize = prefs.getInt(mUuid + ".maximumAutoDownloadMessageSize", 32768);
|
||||
mMessageFormat = MessageFormat.valueOf(prefs.getString(mUuid + ".messageFormat", DEFAULT_MESSAGE_FORMAT.name()));
|
||||
mAutoMessageFormat = prefs.getBoolean(mUuid + ".autoMessageFormat", DEFAULT_AUTO_MESSAGE_FORMAT);
|
||||
if (mAutoMessageFormat && mMessageFormat == MessageFormat.TEXT) {
|
||||
mMessageFormatAuto = prefs.getBoolean(mUuid + ".messageFormatAuto", DEFAULT_MESSAGE_FORMAT_AUTO);
|
||||
if (mMessageFormatAuto && mMessageFormat == MessageFormat.TEXT) {
|
||||
mMessageFormat = MessageFormat.AUTO;
|
||||
}
|
||||
mMessageReadReceipt = prefs.getBoolean(mUuid + ".messageReadReceipt", DEFAULT_MESSAGE_READ_RECEIPT);
|
||||
@ -468,7 +468,7 @@ public class Account implements BaseAccount {
|
||||
editor.remove(mUuid + ".subscribedFoldersOnly");
|
||||
editor.remove(mUuid + ".maximumPolledMessageAge");
|
||||
editor.remove(mUuid + ".maximumAutoDownloadMessageSize");
|
||||
editor.remove(mUuid + ".autoMessageFormat");
|
||||
editor.remove(mUuid + ".messageFormatAuto");
|
||||
editor.remove(mUuid + ".quoteStyle");
|
||||
editor.remove(mUuid + ".quotePrefix");
|
||||
editor.remove(mUuid + ".showPicturesEnum");
|
||||
@ -624,12 +624,12 @@ public class Account implements BaseAccount {
|
||||
// saving MessageFormat.AUTO as is to the database will cause downgrades to crash on
|
||||
// startup, so we save as MessageFormat.TEXT instead with a separate flag for auto.
|
||||
editor.putString(mUuid + ".messageFormat", Account.MessageFormat.TEXT.name());
|
||||
mAutoMessageFormat = true;
|
||||
mMessageFormatAuto = true;
|
||||
} else {
|
||||
editor.putString(mUuid + ".messageFormat", mMessageFormat.name());
|
||||
mAutoMessageFormat = false;
|
||||
mMessageFormatAuto = false;
|
||||
}
|
||||
editor.putBoolean(mUuid + ".autoMessageFormat", mAutoMessageFormat);
|
||||
editor.putBoolean(mUuid + ".messageFormatAuto", mMessageFormatAuto);
|
||||
editor.putBoolean(mUuid + ".messageReadReceipt", mMessageReadReceipt);
|
||||
editor.putString(mUuid + ".quoteStyle", mQuoteStyle.name());
|
||||
editor.putString(mUuid + ".quotePrefix", mQuotePrefix);
|
||||
|
@ -55,7 +55,7 @@ public class AccountSettings {
|
||||
R.array.account_settings_message_age_values));
|
||||
s.put("messageFormat",
|
||||
new EnumSetting(Account.MessageFormat.class, Account.DEFAULT_MESSAGE_FORMAT));
|
||||
//s.put("autoMessageFormat", new BooleanSetting(Account.DEFAULT_AUTO_MESSAGE_FORMAT)); // added to version 2
|
||||
//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("notificationUnreadCount", new BooleanSetting(true));
|
||||
s.put("notifyMailCheck", new BooleanSetting(false));
|
||||
|
Loading…
Reference in New Issue
Block a user