ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove server-side sanitized HTML capability;

Browse Source 
add client-side santized HTML capability

b/16896849

The semantics of the SANITIZED_HTML capability have narrowed. It now means
"Html email bodies for this account are assumed to be sanitized by the mail
server"

Consequently, accounts in Email no longer set this capability, but do set
the new capability permitting client-side sanitization of email bodies

Change-Id: Ie1343d8bedc2a17ab04e4df4b7c4ee14cfb01b64
This commit is contained in:
James Lemieux 2014-09-04 17:53:52 -07:00
parent 6566945492
commit 3bdce9b515
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/email/provider/EmailProvider.java
View File

@ -860,7 +860,7 @@ public class EmailProvider extends ContentProvider
//public static Uri UIPROVIDER_SETTINGS_NOTIFIER; //public static Uri UIPROVIDER_SETTINGS_NOTIFIER;
private static Uri UIPROVIDER_ATTACHMENT_NOTIFIER; private static Uri UIPROVIDER_ATTACHMENT_NOTIFIER;
private static Uri UIPROVIDER_ATTACHMENTS_NOTIFIER; private static Uri UIPROVIDER_ATTACHMENTS_NOTIFIER;
public static Uri UIPROVIDER_ALL_ACCOUNTS_NOTIFIER; private static Uri UIPROVIDER_ALL_ACCOUNTS_NOTIFIER;
private static Uri UIPROVIDER_MESSAGE_NOTIFIER; private static Uri UIPROVIDER_MESSAGE_NOTIFIER;
private static Uri UIPROVIDER_RECENT_FOLDERS_NOTIFIER; private static Uri UIPROVIDER_RECENT_FOLDERS_NOTIFIER;
@ -3394,8 +3394,8 @@ public class EmailProvider extends ContentProvider
// TODO: Should this be stored per-account, or some other mechanism? // TODO: Should this be stored per-account, or some other mechanism?
capabilities |= AccountCapabilities.NESTED_FOLDERS; capabilities |= AccountCapabilities.NESTED_FOLDERS;
// sanitization happens lazily in the EmailMessageCursor as HTML email bodies are requested // the client is permitted to sanitize HTML emails for all Email accounts
capabilities |= UIProvider.AccountCapabilities.SANITIZED_HTML; capabilities |= AccountCapabilities.CLIENT_SANITIZED_HTML;
return capabilities; return capabilities;
} }