Reply-all setting is modified at runtime, don't cache it in a static map

b/11066041

Change-Id: I4e14c3add3fe2503e8369dbb7ef976e110ef2fee
This commit is contained in:
Tony Mantler 2013-10-04 13:25:26 -07:00
parent 91508db973
commit b424ffa65b

View File

@ -2308,10 +2308,6 @@ public class EmailProvider extends ContentProvider {
AccountColumns.SIGNATURE) AccountColumns.SIGNATURE)
.add(UIProvider.AccountColumns.SettingsColumns.SNAP_HEADERS, .add(UIProvider.AccountColumns.SettingsColumns.SNAP_HEADERS,
Integer.toString(UIProvider.SnapHeaderValue.ALWAYS)) Integer.toString(UIProvider.SnapHeaderValue.ALWAYS))
.add(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR,
Integer.toString(mailPrefs.getDefaultReplyAll()
? UIProvider.DefaultReplyBehavior.REPLY_ALL
: UIProvider.DefaultReplyBehavior.REPLY))
.add(UIProvider.AccountColumns.SettingsColumns.CONFIRM_ARCHIVE, "0") .add(UIProvider.AccountColumns.SettingsColumns.CONFIRM_ARCHIVE, "0")
.add(UIProvider.AccountColumns.SettingsColumns.CONVERSATION_VIEW_MODE, .add(UIProvider.AccountColumns.SettingsColumns.CONVERSATION_VIEW_MODE,
Integer.toString(UIProvider.ConversationViewMode.UNDEFINED)) Integer.toString(UIProvider.ConversationViewMode.UNDEFINED))
@ -2985,6 +2981,12 @@ public class EmailProvider extends ContentProvider {
values.put(UIProvider.AccountColumns.QUICK_RESPONSE_URI, values.put(UIProvider.AccountColumns.QUICK_RESPONSE_URI,
combinedUriString("quickresponse/account", id)); combinedUriString("quickresponse/account", id));
} }
if (projectionColumns.contains(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR)) {
values.put(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR,
mailPrefs.getDefaultReplyAll()
? UIProvider.DefaultReplyBehavior.REPLY_ALL
: UIProvider.DefaultReplyBehavior.REPLY);
}
final StringBuilder sb = genSelect(getAccountListMap(getContext()), uiProjection, values); final StringBuilder sb = genSelect(getAccountListMap(getContext()), uiProjection, values);
sb.append(" FROM " + Account.TABLE_NAME + " WHERE " + AccountColumns.ID + "=?"); sb.append(" FROM " + Account.TABLE_NAME + " WHERE " + AccountColumns.ID + "=?");