History log of /packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
9ac224f701c9ff8bf684c81c4c140cde6532f8d6 24-Sep-2014 Tony Mantler <nicoya@google.com> Update Message.isEqual() method

It now compares more fields relevant to displaying in ConversationView

b/17064384

Change-Id: I61f0308dbdfc6fbcab34045898716db05818510e
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
7800d2921fdd9b2c400d389076eaac09be5fc67c 24-Aug-2014 Jin Cao <jinyan@google.com> Add logging to sendsave for compose

Change-Id: I3ee2dedc35cf4b00fd355ce205653c516a1ce9c5
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
23caa3ec923cd3bdbe1dcf0af454e1047cfbb26d 08-Aug-2014 Jin Cao <jinyan@google.com> Properly check for message equality

Message attachments can change but the uri might
not necessarily change if the previous uri is not
null. Check the attachment list hashcode as well.

b/16835303

Change-Id: Icff7bf597978ae03b40682269a02bba1b981dce1
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
735a22a197215ec4787ad9f3cbaf465cce54f4d0 11-Jul-2014 Andrew Sapperstein <asapperstein@google.com> Quantum CV - drafts. b/16138121

New assets, new red color for drafts.
Super-collapsed becomes red when there's a draft.
Conversation footer is hidden when last message is a draft.

Change-Id: I89a58971a19475be79f56cae53934f3c7b2ab894
Missing: properly re-sizing the footer.
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
8227d56403be742613bba22f99b8bc9e961c187a 30-May-2014 Jin Cao <jinyan@google.com> am 6a2df258: Provider support for different sending states for messages

* commit '6a2df258316b267151296556dbbdba20200ecb1f':
Provider support for different sending states for messages
6a2df258316b267151296556dbbdba20200ecb1f 30-May-2014 Jin Cao <jinyan@google.com> Provider support for different sending states for messages

Add support at the provider layer to differentiate among different
sending states (not sending, sending, retrying, failed).

b/9805976

Change-Id: Icb47412ad6f961f36adb6223a6289b0c4dcd7a2c
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
27a36a6bbeebb6cfd53ad2766463d71ab4b26ce0 20-May-2014 James Lemieux <jplemieux@google.com> Sanitize HTML bodies from .eml files and support quoted text

b/14567151

Sanitizes HTML email bodies on demand as they are parsed from .eml attachments.
Adds the OWASP sanitizer to the license page
Adds HTML translation to support quoted text collapsing for emails from Gmail,
Yahoo and AOL.

Change-Id: Ie710e63054539887f507437e2e4fa6ae8415a305
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
8e1ffbf042a23824a97a9f47cfc81cf6f14603be 23-Apr-2014 James Lemieux <jplemieux@google.com> Gmail does not display inline attachments nor does it offer "Show
pictures" within the EML viewer

b/13912473

The Eml viewer (and indeed all Secure Conversation Views) now
offers "Show Pictures" to display the inline images.

Those inline attachments are also displayed as tiles at the
bottom of the Secure Conversation View so that interaction with
them is possible.

Change-Id: Ida66820c98c88b222e459aa9d2559383a3b608a0
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
934b1f470a646a4ca64fc63eeb823d4c5c12698e 09-Apr-2014 James Lemieux <jplemieux@google.com> Inline images are not displayed for IMAP and POP emails

b/11998344

This solution covers these use cases:

1) Inline images in the Email app.
2) Inline images in .eml attachments in the Email and Gmail apps.

The solution here was to override shouldInterceptRequest(...) in
the WebViewClients and resolve any cid urls that are encountered
within the email body.

EmailProvider and EmlAttachmentProvider both gained the ability to
query for an Attachment object using a message ID and cid (which
is stored in the database column: contentId).

With this new query in place, it was straightforward to fetch the
Attachment in the WebViewClient and then obtain an InputStream to
the file that backs the Attachment to return back to the WebView.

Change-Id: I7c0e33e62d6cdbd6a2a3fc81e8621755bdbaf704
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
20c2082e85e87dc9c70b3d74e20ed31d3eff7364 16-Apr-2014 Andrew Sapperstein <asapperstein@google.com> Send PLID with message instead of conversation.

Fixes b/13748439. Sending with conversation required
server-side changes and wasn't actually more memory efficient.
Arguably it would be less efficient.

Change-Id: I346d61387513e94a7387d7feaa68b3e6d2a7b2de
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
2ef5f08719a9981d73f7954ce82a78ea6842f187 31-Mar-2014 Jin Cao <jinyan@google.com> Fixed draft data inconsistency

NOTE: THIS BUG APPLIES TO ALL DRAFT FIELDS (including subject,
to, cc, etc.), NOT JUST THE BODY.

The bug is caused by some kind of delayed server response where
the data inside the adapter is out of sync with the newest data.

We now force the adapter to update itself whenever any part of
the draft changes to force data consistency.

b/12587302

Change-Id: I01eea8f3aeafa14a03daad62f3462db65c3048ec
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
f59d01c3116dc2adde97a5b52aa6094144c2d315 20-Feb-2014 Andrew Sapperstein <asapperstein@google.com> View entire message UI.

We need the per-message plid server support,
but we are forwarding the clipped bit to
the UI and showing a button based on that
bit. Clicking that bit will open the
plid viewer for gmail. Email should be
unaffected as it does not ever return clipped as true.

b/2887917.

Change-Id: Iddb54e37cf650ca16a75fcbe69f1861becdd81b9
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
5a5c53d39abfa4d4d79081a450aecb61a6744911 12-Feb-2014 Andrew Sapperstein <asapperstein@google.com> Don't print inline attachments. b/12175599.

Change-Id: Ie078f2fb0e3adc9490afaf00c1c9b64b80c560e6
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
4d3e937bb3ca208c320e8a124c6f26079c4090d0 23-Jan-2014 James Lemieux <jplemieux@google.com> Eliminate redundant methods in Address class

THIS DOES NOT CHANGE ANY EXISTING FUNCTIONALITY.

Address.pack() has been removed and all calls replaced with its synonym Address.toHeader().
Address.unpack() has been renamed to Address.fromHeader() to follow the new naming convention.

In days of yore, pack() and toHeader() used to do different things. Now they are identical and
thus one is superfluous. We have standardized on toHeader() and fromHeader().

Change-Id: I199d7718e6816385c9433c3bd7201f80f2287f10
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
2bae2f5ef13424f8d932f5e45a2e276b531ecfe6 14-Jan-2014 Martin Hibdon <mhibdon@google.com> Update proguard flags to fix test case

b/12122951

Change-Id: I5e3ff2f9b9e6b2ed7747601297715e1b061b5707
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
821e578a71c7015646522e729600618f0ec16fc0 07-Jan-2014 Tony Mantler <nicoya@google.com> Deduplicate Address class

Change-Id: I4f6df51f5641475ffaf96b0189ccc00748880cc0
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
20dbbd66471f23520fbddf63c5af6a517839f5e8 11-Dec-2013 Andrew Sapperstein <asapperstein@google.com> Don't crash on bad eml files. b/12066982.

Change-Id: I174f6a341f9ee47b1e95c74ef48ac0fdf6332860
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
da153fb1651c2f70fbb3a2f9930950faec8b798b 09-Nov-2013 Yu Ping Hu <yph@google.com> Linkify email addresses only.

Bug: 11553093
Change-Id: I7fc8a3b34d9b80caa6f772840a3767c2602e5f81
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
8d6e803bf63d5dad5cb0187c82171e42147e8a44 04-Nov-2013 Yu Ping Hu <yph@google.com> Linkify email & web in plaintext messages.

Bug: 11553093

Change-Id: If59eb78fa57d9940f9388ded0697cb728d401caf
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
aa27bc0e1c3bb6be4609b00007637a9d3e960f5e 02-Aug-2013 Scott Kennedy <skennedy@google.com> Fix more warnings

Change-Id: I78c6df845aae3475c1e2469b29b52cc995d8d3ae
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
606dbd7a44b8445e872c25c0fe080e3e12a47adf 31-Jul-2013 Andrew Sapperstein <asapperstein@google.com> Remove ad code.

Moved to UnifiedGmail. Also refactored
HtmlConversationTemplates to use HtmlMessage,
a new interface instead of the Message class.

Change-Id: Ie14694b37800ed9eb9fc692d434508f66660d55b
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
9016a5e827ae7baff9199811ecc8a9de9690b838 19-Jul-2013 Tony Mantler <nicoya@google.com> Handle html encoding in email addresses b/8129548

Change-Id: Ia11cc1d0d042649f896f8405990e660d23749455
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
7434e800d4313a227120ca36bd95683752a7879f 21-Jun-2013 Andrew Sapperstein <asapperstein@google.com> Attachments in eml files.

It's kinda slow for large eml files
(because we have to parse the entire
file) but it works. Hooray.

Fixes b/6393073.

Change-Id: I2d7a87a484cd282a000a0905fe069f3ab45e2061
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
8812d3c50e35c4f2a02d29c35c76082c4ebec0cd 05-Jun-2013 Andrew Sapperstein <asapperstein@google.com> Refactor ConversationMessage out of MessageCursor.

Just moved the static final inner class to its own
file and fixed up the imports. Also moved the MimeMessage
parsing into Message instead of in ConversationMessage.

Change-Id: Ic35d4cf5e52b392d68898ff47efaeeee4d0865b0
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
a990a715012379451344246c5156d29938f12886 14-Mar-2013 Alice Yang <alice@google.com> Load ref message for edit draft.

When user replies to a message, save it as draft, open it again, and
toggle the "reply" vs. "reply all" drop down, we were not populating
the "to" and "cc" fields with the sender and recipients of the original
email because mRefMessage was not being populated and left as null.

The fix is to use an additional loader to query for the reference message
that the draft was replying to. Because the refMessageId is stored
in database as the server message id, and there's no existing URI for
querying message by server message id, added such a URI to UIProvider.

Bug 8295718

Change-Id: If6815bb272131a1ab1209ac9a595de9eb43aa2f4
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
013a23c75cf8a71c51ad1580aa84f2a8e06b6761 22-Feb-2013 Paul Westbrook <pwestbro@google.com> Remove deprecated fields/members

Change-Id: Ica1c9dbc0f190a0565c548f6566837287b19d39c
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
d5edd2d02649dffb40065fdb6a16acf91552b800 05-Dec-2012 Scott Kennedy <skennedy@google.com> Move notifications to UnifiedEmail

This involves redoing the persistence model, to split general,
account, and folder settings into separate SharedPreference stores.

It also requires some preferences to be moved into UnifiedEmail.

Depends on I71802444add85dc01f6645906a629ff80b964222 (UnifiedGmail)
Depends on Ie6ec389b5b5d2e7ab1b299d0877811ae716526e2 (Email)

Change-Id: Ibe2e3f93ec164370535ffc5f5b2409544cc8d36d
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
8960f0af431bc164003e09b3c8981aab808d9ec1 08-Nov-2012 Scott Kennedy <skennedy@google.com> Maintain to/cc/bcc state on rotation

The tokenized string was never updated after being initially set,
even if the backing values changed.

Additionally, the to/cc/bcc values were never updated once the
Message was initially created.

Bug: 7490394
Change-Id: Iae1c8ae88f9ab5b8e2e7fe10835587b61decf0c8
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
72e2ea860f66f496537e37ebc0ddd2c670d4c651 23-Oct-2012 Paul Westbrook <pwestbro@google.com> Use ContentResolver#call() to send or save messages

The Unified code still has support for the old mechanism for
sending/saving. If the the call() method returns null, we will
fall back to the the deprecated methods

Bug: 7381557
Change-Id: I25cc83858f25b4d52c25d1fadd166127f4dd857e
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
6766b6e5468d2f1935587b3bc1f8e65be94cd6fb 28-Sep-2012 Andy Huang <ath@google.com> fix conversation flicker when sending on a thread w/ attachments

Conversation state hash comparison was taking attachmentsJson
into account, but that's not safe to do because it's mutable.
(conversation render re-generates that JSON string, not
guaranteed to be identical)

However, we still need attachment state comparison to reload
conversation view enough upon saving a new draft w/ attachments.
So replace simple but unsafe JSON string compare with
order-agnostic attachment URI set comparison in
getAttachmentsStateHashCode().

Bug: 7183109
Change-Id: I99c2c6d5eca2d2d3858f2cc004e1dc63ff8255aa
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
233f562368e4e3af9ca86b16d1b0a151df6157ea 28-Sep-2012 Paul Westbrook <pwestbro@google.com> Expose the address tokenizer

Fixed parceling Account objects
Bug: 7243076
Change-Id: I417797e07280698dfce0bf70c3bf573fd43bc4b8
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
014ea4c15d147794789b9c5bf4e243fa08781ad9 25-Sep-2012 Andy Huang <ath@google.com> handle sender/body changes in-place

Sending a new message updates sender string (for custom froms
and such) and the body (for elided text), after the message is
sent and synced. Avoid conversation view flashing (re-render)
in those cases by applying the changes in-place.

Sender string changes will update all dependent adapter items,
and a dataset change on the adapter re-renders all overlay
views.

Body changes are handled by sending affected IDs to JS so it can
request individual message bodies. Quoted text collapsing is
then re-applied on each new body.

Bug: 7183109
Change-Id: I630187c276ffc63448e6b457c9cd02afd452c438
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
845f87e34179bcbb2862c09572576ab775be472d 25-Sep-2012 mindyp <mindyp@google.com> Use expected format when updating contacted sendres.

Fixes b/7219017 Contact suggestion ranking not working

Change-Id: I693586ab408eb0069df9051cadfcc47e07072339
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
5ed6311d6beb968e83585a43d7cdf5909e0a2cf6 18-Sep-2012 mindyp <mindyp@google.com> We cant just split on commas because of "Last, First" <address>

Use an rfc822tokenizer to get the corrected recipients
this will also fix the issue where cc/bcc/to recipients are sometimes displayed as ,,,,,address in conversation view
Fixes b/7173819 cc list not autocompleting correctly for gmail message

Change-Id: Ia8744daafdece7ac5ad6177e969f21e436d79654
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
cd5c5eeae167885ffa2959c200233fea2f39c5f7 13-Aug-2012 Andy Huang <ath@google.com> refine message cursor update accept/reject logic

Conversation view should ignore no-op or irrelevant
MessageCursor changes, but certain other changes should refresh
the view. Use hash codes for each message and for the entire
cursor to distinguish.

Updates from the server confirming a client-side read/star
change no longer cause the conversation view to reload.
Other cases that do cause a reload:
* edit draft locally or on the server
* read/star change on the server
* discard draft locally or on the server

Now that mCursor is changing all the time, and not always
reloading the view, we have to be extra careful to not keep
stale references to the old mCursor after a change (because
CursorLoader will close the old cursor after onLoadFinished).
This meant mPendingCursor wasn't needed.
This also meant ConversationMessage needed an intermediary to
get the current cursor.

Bug: 6951782
Bug: 6437156
Change-Id: Ibd94eb9dc0e72fae371e47db08dff0d7c09ee145
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
d47877e3860ea4249eddb3f6efefbc6cd39f2320 10-Aug-2012 Andy Huang <ath@google.com> message "serverId" field is a string, not a long

Also remove some unused usage of serverId.

Change-Id: Ic421a77bfff6218a07d35f80219a2fae729ceb13
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
41dca185f7683b36bdafd9520c0648c897a95834 07-Aug-2012 Paul Westbrook <pwestbro@google.com> Support for content provider inline attachments

Change-Id: I1c356487bb38f7feae6437de21c52e35fcaa53fa
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
47aa9c991b33c722a6ba1946fc02e0aba17bc1c9 01-Aug-2012 Andy Huang <ath@google.com> "new message from" in conversation view on update

* put the New Message bar in a new floaty layer in
ConversationContainer. snap header can also live here.
* add left/right margin support to ConversationContainer

Send/save of a new message also generates the 'new message'
notification for now.

Bug: 6384217
Change-Id: I10a40bbf87423194214e5ded08539abaaf7fd25c
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
daa06aba887e8e3748453f45ae52c1e571fe9f2e 24-Jul-2012 Andy Huang <ath@google.com> fix restore of conversationInfo upon mark unread

When marking partially (or fully) unread threads unread from
conversation view, the change didn't appear to take effect until
the next refresh because I was using the caching URIs instead of
the underlying ones.

Change-Id: I92cfcba1537c08f0609866619e52da4b7b13d53d
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
839ada22ea84251dde3305003d2f8fc5bf14914e 21-Jul-2012 Andy Huang <ath@google.com> save/load conversation state, add granular mark unread

Centralize mark read/unread logic in AAC.
Restore some conversation view state upon rotation.
Clean up code for star/unstar from conversation view. Move most
of that logic to AAC.
Move transient conversation state from Message into
ConversationMessage subclass.
Add new AsyncTask for content provider single or batch requests.
We should move to using this instead of AsyncQueryHandler or a
raw thread.

Bug: 6293711
Change-Id: I907a687ef7ff287fece8c90725dbd204a02485e9
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
d5b369b324a22d28b63def902eefaf6591edf004 13-Jul-2012 Andrew Sapperstein <asapperstein@google.com> Added the via domain to the UI.

When the via domain exists and the message is
expanded, the message subtitle shows "via blah.com"
instead of the normal address. Additionally, if
the via domain exists and the message details is
expanded, a from row appears that shows the full
name, address, and via domain. This row only appears
if there is a via domain.

Change-Id: Ic39d7d90d72592e300fc6d6144e62e4b08db3b91
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
3b08c51ec46794b3c22c8649eb86bf77c72e0d9a 12-Jul-2012 Andrew Sapperstein <asapperstein@google.com> Spam warnings now show in the UI.

Based upon the specific attributes of the message,
various different UI options are set for the warning.

Change-Id: Ifc49ab122c453dde0464ae516c3cfa443d92c21d
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
e623a0f6e3caa9cafec913cf826e946628833517 13-Jul-2012 Andy Huang <ath@google.com> more docs

Change-Id: I63dea9ac00c8a937d950e6f4fe3af140ffa9b8dd
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
3842af9e8ba90ebf5b75dc5018bbfdfb2e044f99 27-Apr-2012 Marc Blank <mblank@google.com> Support viewing meeting invitations

* Added intent uri for event viewing

Bug: 5011918

Change-Id: Ie77dfce8c22ccef1d21f31461ade8edc3674085c
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
a71f1f3368f26b6627512298f64484611fd6b0e8 25-Apr-2012 Andy Huang <ath@google.com> calendar invite UI

The actual UI is a bit of a placeholder, as the old UI didn't
match desired specs either.

Bug: 5011918
Change-Id: Idd8a845f6840ba4d96adfc05c8142e6c5c1d04a1
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
bf232c3735f65b1a4746943e4a134e59e36f0bde 18-Apr-2012 Paul Westbrook <pwestbro@google.com> Major refactor of ConversationCursor

* ConversationCursors are now associated with a particular loader;
there are no static methods or static state fields
* ConversationCursorLoader maintains a list of current loaders
(for tracking/debugging)
* AbstractActivityController acts as a router of conversation
changes to/from fragments (currently message view -> conversation
list)
* Comment out some ConversationCursor tests for now

Change-Id: I9b8425a19c77501796b6681142e1bc0ad20b3693
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
cf164d64bcb1da92b427bda99b97f7ec310ef704 20-Apr-2012 Marc Blank <mblank@google.com> Revert "Major refactor of ConversationCursor"

This reverts commit 5150f03723af8019169aeed8e406784da9c5f8f1.
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
5150f03723af8019169aeed8e406784da9c5f8f1 18-Apr-2012 Paul Westbrook <pwestbro@google.com> Major refactor of ConversationCursor

* ConversationCursors are now associated with a particular loader;
there are no static methods or static state fields
* ConversationCursorLoader maintains a list of current loaders
(for tracking/debugging)
* AbstractActivityController acts as a router of conversation
changes to/from fragments (currently message view -> conversation
list)

Change-Id: I0eb554615b4bf93b3547ff28e2bd5913e8703a97
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
e8f94dc92567d8efa691860c38720d3ae753f429 16-Apr-2012 Mindy Pereira <mindyp@google.com> Fix a bunch orientation related issues.

Restore contents of message from bundle on orientation changes
We don't care about whats in the draft, since it may not be done
saving yet anyway

Change-Id: I51ef0324fa871b3624c16e24e60d43c92f9ef5a0
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
5c5fd571b40a15b95ea5a5d6033f377706ffd0fb 09-Apr-2012 Andy Huang <ath@google.com> compose attachment refactor

This is step 1 to modernize attachment handling in Compose.
This CL tries to have Compose view deal in Attachment objects
rather than the raw pieces like URI/name/size. For those cases
where the raw pieces are all we have (e.g. incoming intent),
AttachmentsView.generateAttachment() is now a single place for
this work.

When loading a saved draft or forwarding a message with
attachments, since those Messages already have fully populated
Attachment data available via getAttachments(), use that.

Mark various Gmail-style joinedString representation variables
and methods deprecated in favor of passing JSON in
ContentValues when necessary. The next step is to beef up the
supported fields in the attachment JSON and have send/save pass
JSON and have providers read JSON.

Bug: 6305925
Change-Id: Ie8fb9ce27d71a10a6ea8ae431b78e61ffe5933e2

Conflicts:

src/com/android/mail/compose/AttachmentsView.java
src/com/android/mail/compose/ComposeActivity.java
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
62de1b104635b09e7f00b0941268ba1fa5460ddb 06-Apr-2012 Mindy Pereira <mindyp@google.com> Correct from.

Change-Id: I5c4f10fbc1079c8a465fe864dd983c49f5a01139
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
7bdc3750454efe59617b7df945eadd7e59bee954 26-Mar-2012 Andy Huang <ath@google.com> building blocks for bottom-aligned attachments

Attachment overlays now warrant their own adapter entries,
because they are no longer attached to each message header.

So since cursor items no longer map 1:1 to adapter items, add a
new specialized adapter to house different kinds of scrolling
overlay views. This support is also needed for super-collapsed
blocks.

The adapter is also an ideal place to store transient render
state like 'expanded' and 'show pics', as each ConversationItem
can manage its own state instead of having the fragment do it.
And view recycling requires that the adapter remember item
state as you scroll around anyway.

Next CL will actually separate attachment views and logic out
of MessageHeaderView.

Change-Id: Ibc589915f01ada0d9a41d8968a0ee63be6030449
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
9ab47b16e0189d219c16e2eddfbd66c741c01229 28-Mar-2012 Andy Huang <ath@google.com> fix email-specific NPE

"attachmentsJson" field is unpopulated right now in Email2.
Guarantee that getAttachments() never returns null.

Change-Id: Ic37ac86196deef4f5c1a3959ee1dab75b7f40f02
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
2421dc8d6d0b4c727ab7ab0e5ce730f415089e86 27-Mar-2012 Mindy Pereira <mindyp@google.com> Read attachments from the draft conversation.

Fixes b/6236948 Draft messages drop attachments.

Change-Id: Ic8da50fa81de699a076a193e3097c9946113812c
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
5a9290731bf565538a9cf91892346c7a6f4da0ec 24-Mar-2012 Andy Huang <ath@google.com> Add bits of Attachment info to message cursor results

Ultimately, message view needs more information about how many
attachments a message has and what sort of files they are to
render UI upfront and allocate space in the HTML for them.

I'm adding a new field in Message cursors to contain this basic
attachment info as a JSON array. Soon we can expand the format
to be useful to compose, and can deprecate
'joinedAttachmentInfos'.

Change-Id: I9c264a6f09b376f5ee9b9f56e11fa80dc5faec56
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
bec5115726f24733a0a1577caaf05fb6e9ef9c6f 23-Mar-2012 Marc Blank <mblank@google.com> ConversationView -> ConversationList starring

* Star/unstar in the conversation view is now reflected instantly
in the conversation list

Change-Id: I0dade26726bec96610b4c30dded19d36c9dbe439
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
26846d859a4714ff90ea02dba251a54cac1f1e9f 23-Mar-2012 Marc Blank <mblank@google.com> Rename conversationId to conversationUri in Message

* Make it a String type

Change-Id: Ic2a7b1f567157606ce15663fc63d34eec3ebbd45
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
4b8e44b6c19e0dc73c92679136e3b9b7066b87bb 22-Mar-2012 Mindy Pereira <mindyp@google.com> Remove include quoted text.

Change-Id: Idc6b97a9d31d9d682daca066a8d7f5bfee572c72
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
d8e249ee7abb0e1ad24e17e4e299736d4a150936 22-Mar-2012 Andy Huang <ath@google.com> implement star/unstar on a message

Switch to separate read/starred flags to avoid committing stale
flag values.

Change-Id: Ib9f37ba3821f1e67675a803bce7739c64b8f628b
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
3233bff8ae08a56543c9f5abf1bc6ab38f0574ce 21-Mar-2012 Andy Huang <ath@google.com> hook up 'show pictures' button

Add 'show pictures' button for messages where the provider
claims it embeds external resources. In Gmail, this is true when
a message contains external image hotlinks. Inline image
attachments are not yet handled.

'always show' tells the provider to whitelist the message sender
to allow images in the future (works with Gmail provider).

Change-Id: I1b174d8fad9da481ec305caff06d109f9d215093
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
bb87b7fa57f25fc9cee1f572dd253f33f58f81da 21-Mar-2012 Paul Westbrook <pwestbro@google.com> Enable editing of existing draft messages
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
1c078cff1958b29e280100bfa6221103ec46b555 21-Mar-2012 Paul Westbrook <pwestbro@google.com> Temporarily revert this change while I fix the Email build


Revert "Enable editing of existing draft messages"

This reverts commit aeb7cab52bb34c94c3de4319948a8e337ed77a01
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
aeb7cab52bb34c94c3de4319948a8e337ed77a01 20-Mar-2012 Paul Westbrook <pwestbro@google.com> Enable editing of existing draft messages

Change-Id: Ib9154bffe33fda6693ef832610c81a5542eb771c
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
4dbbf9f91da20d89b13d412038c0b19b91983f8c 20-Mar-2012 Mindy Pereira <mindyp@google.com> Add quoted text fields to message obj.

Change-Id: Ifc7d91768d3eb1ceed263209dd3e66927cb913c7
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
0a22047bb6c54d8f1ce980762f75908e35b08c3d 15-Mar-2012 Andy Huang <ath@google.com> "fix" starred check on a message

Change-Id: I824428020949333998c30cf6c6d6e2b1b6661255
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
7bb27253d9eb377d13da55b67b0babd047eca367 07-Mar-2012 Mindy Pereira <mindyp@google.com> Make sure we have an attachments uri before converting the uri.

When composing a message, has attachments will be true, but we
wont have a lookup uri yet.

Change-Id: Ie16696d7473b68df0f4f64fc2022500e8a32f7f9
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
104f729c284f9b7b31a251350252f8ae31d09f86 29-Feb-2012 Paul Westbrook <pwestbro@google.com> Support for "always show images" from sender

Change-Id: I1e23af65d28d40c731f91f4bce3bf19a06d34fc8
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
cfb7f33ff8ef9dc60b9143af32de64c7a3d71f36 28-Feb-2012 Mindy Pereira <mindyp@google.com> Store URI's in Uri instead of String.

Change-Id: I5492a61b80442afc7cebc5b3d560688aebae8820
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
a831b2f1ba6d3c18d5e54563df8bae1f589c4257 24-Feb-2012 Mindy Pereira <mindyp@google.com> Use a constructor to create a provider object.

Some were using from(Cursor), and it was confusing.

Change-Id: I49655b4ed013fb4dd47cdefea0bfd850a3fa4517
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
7ed1c1122c5677344a1ce176be2c03972fed26f5 18-Jan-2012 Mindy Pereira <mindyp@google.com> Setup saving drafts.

Change-Id: Id308cf902ec8ea15d2d785f21b1c821a281f8a2c
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
f944e9655562e321aff52fe5f437e1d2fa2950a9 17-Jan-2012 Mindy Pereira <mindyp@google.com> Handle attachments on sent messages.

Change-Id: I13a2b9250b61fd059b4b3f92caff03c7a3614881
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java
3ce64e7ceb6246130342385d91550bcf33b31cc8 13-Jan-2012 Mindy Pereira <mindyp@google.com> Create parcelable message.

Also, gets rid of and renames fields that required them per:
name change to appendRefMessageContent
remove custom_from field
remove quoted text pos

Change-Id: I33a2f83b906d2504a8a6ae58f79f1618bb8a20cd
/packages/apps/UnifiedEmail/src/com/android/mail/providers/Message.java