From 3bdce9b515f6bde3506596a6b5d3bdbaff9b7423 Mon Sep 17 00:00:00 2001 From: James Lemieux Date: Thu, 4 Sep 2014 17:53:52 -0700 Subject: [PATCH] Remove server-side sanitized HTML capability; 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 --- src/com/android/email/provider/EmailProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index b82bae096..1b37b3680 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -860,7 +860,7 @@ public class EmailProvider extends ContentProvider //public static Uri UIPROVIDER_SETTINGS_NOTIFIER; private static Uri UIPROVIDER_ATTACHMENT_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_RECENT_FOLDERS_NOTIFIER; @@ -3394,8 +3394,8 @@ public class EmailProvider extends ContentProvider // TODO: Should this be stored per-account, or some other mechanism? capabilities |= AccountCapabilities.NESTED_FOLDERS; - // sanitization happens lazily in the EmailMessageCursor as HTML email bodies are requested - capabilities |= UIProvider.AccountCapabilities.SANITIZED_HTML; + // the client is permitted to sanitize HTML emails for all Email accounts + capabilities |= AccountCapabilities.CLIENT_SANITIZED_HTML; return capabilities; }