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

am 46f73c05: am 7266502c: am 3bdce9b5: Remove server-side sanitized HTML capability; add client-side santized HTML capability 

* commit '46f73c05dd864a04f93ee7866e3601f07270642b':
  Remove server-side sanitized HTML capability; add client-side santized HTML capability
This commit is contained in:
James Lemieux 2014-11-02 17:37:08 +00:00 committed by Android Git Automerger
parent e62810f7f6 46f73c05dd
commit 93d724aa2b
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;
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;
}