From 24a489c3de70a02bccbf2cfc54b36a385d72c337 Mon Sep 17 00:00:00 2001 From: Alice Yang Date: Wed, 30 Oct 2013 10:07:59 -0700 Subject: [PATCH] Always ask before displaying images for Email In Gmail, we are adding a setting that automatically shows external images instead of asking user first. Email app should preserve old behavior. Bug 11158252 Change-Id: I8b04a1ec31638d756dfee2da8ab2e8178a709416 --- src/com/android/email/provider/EmailProvider.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index 1ffefda93..3e5284823 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -103,6 +103,7 @@ import com.android.mail.providers.ConversationInfo; import com.android.mail.providers.Folder; import com.android.mail.providers.FolderList; import com.android.mail.providers.MessageInfo; +import com.android.mail.providers.Settings; import com.android.mail.providers.UIProvider; import com.android.mail.providers.UIProvider.AccountCapabilities; import com.android.mail.providers.UIProvider.AccountCursorExtraKeys; @@ -3342,6 +3343,10 @@ public class EmailProvider extends ContentProvider { values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.MOVE_TO_INBOX)] = combinedUriString("uifolder", combinedMailboxId(Mailbox.TYPE_INBOX)); } + if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.SHOW_IMAGES)) { + values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.SHOW_IMAGES)] = + Settings.ShowImages.ASK_FIRST; + } mc.addRow(values); }