Merge commit 'b634dbf618f03eb19801139fed6c8237db0d01d2' into eclair-mr2
* commit 'b634dbf618f03eb19801139fed6c8237db0d01d2':
Import revised translations. DO NOT MERGE
Merge commit '20b3ba2303da8b790afedf84bd20f370bbdf703b' into eclair
* commit '20b3ba2303da8b790afedf84bd20f370bbdf703b':
Import revised translations. DO NOT MERGE
Merge commit '73032f4657a77f733a348fe3c2c1fa783d335ff0' into eclair-mr2
* commit '73032f4657a77f733a348fe3c2c1fa783d335ff0':
Email: exit AsyncTask.onPostExecute() if the result is null or isCancelled().
* Fixes#2173664
* Make sure that not only is the OPTIONS command accepted, but that
the server reports EAS versions and commands
Change-Id: I15dccd1fbd06aa3cf2ba8fbbf72d20918ec44617
Merge commit 'dfee3ff278c4f5d9f7b8273c0e6ecab42585213e' into eclair-mr2
* commit 'dfee3ff278c4f5d9f7b8273c0e6ecab42585213e':
Fix a crash when you scroll MessageList to junk @ bottom
Merge commit '5b26bbe4551ca095697f07eca7d09b24573cba11' into eclair-mr2
* commit '5b26bbe4551ca095697f07eca7d09b24573cba11':
Switch QuickContact presentation from MEDIUM to LARGE.
Merge commit '1cd5e5f03cc2f707ddfd46d439e6991db7454ab8' into eclair-mr2
* commit '1cd5e5f03cc2f707ddfd46d439e6991db7454ab8':
Import revised translations. DO NOT MERGE
Some IMAP servers return NIL if you BODY.PEEK[TEXT] a messsage with
no body, instead of the more canonical {0}CRLF. Instead of messing with the
parser to deal with that, it makes more sense not to try and fetch empty
bodies. So there are three changes:
* Don't fetch parts when size = 0
* Don't append "null" when there is null body text
* Slight change to attachment handling so size is reported >0
* Unit tests on some of the related lower-level protocol stuff
Bug http://b/issue?id=2160387
Change-Id: Ifb8fb0ed5ce7297908e1ae8d5a02dda5975c4a3c
Merge commit 'e1b5e8574c86e4dcc184f1b3a4db352c9a631d99' into eclair-mr2
* commit 'e1b5e8574c86e4dcc184f1b3a4db352c9a631d99':
Help with another push inconsistency edge case (#2131432)
Merge commit '85d718cb0735de9069673fbf9834fa64459c2178' into eclair-mr2
* commit '85d718cb0735de9069673fbf9834fa64459c2178':
MessageCompose: quote plain-text body if available, otherwise quote HTML body.
* MessageCompose now adds message-id to new messages (it was previously
done on its behalf by MimeMessage).
* LegacyConversions.updateMessageFields() now handles missing message-id
without error.
* Unit tests for the LegacyConversions change
These two issues were combining with a failure of comcast's SMTP server
to insert message-id headers, to prevent delivery of a message between
any two comcast accounts using this client.
Bug # http://b/issue?id=2161478
* If we are forced to abort a "ping" due to a watchdog alarm, we should
handle this as a ping failure (which potentially changes the heartbeat)
rather than a garden variety IOException.
* This prevents the additional overhead of connection error backoffs,
which would only tend to increase the time needed to recover from the
error.
* In one case reported by Moto, this appears to be the behavior of a WiFi
router with NAT timeout. This fix will cause maximum delay for pushed
mail to be reduced in most cases.
Change-Id: I2b0e3b10d82762d20f63cac3ac4638a03f13f842
Merge commit '1ef86a50f8f6bf09cb031359c1d7cf0902c4a441' into eclair-mr2
* commit '1ef86a50f8f6bf09cb031359c1d7cf0902c4a441':
MessageView: scroll to (0,0) on message change.
Merge commit 'd493ba257a1632a8de578e06a7df7ed311227887' into eclair-mr2
* commit 'd493ba257a1632a8de578e06a7df7ed311227887':
Avoid NPE at onRefresh in MessageList
Merge commit '8647be095a75a25df98487d6e908a94f2d6fb076' into eclair-mr2
* commit '8647be095a75a25df98487d6e908a94f2d6fb076':
Correct issue with mail change parsing (fixes#2165649)
* Older parsing code that didn't take into account the fact that
'flag' is a structured data item
* Requires Dr. No approval for Eclair_Sholes
Change-Id: Id1c0bc24e784b19c598d2b852975e135abebbdb0
Merge commit '888ea64f86e518de18806ef85bc7c16ba29f72f6' into eclair-mr2
* commit '888ea64f86e518de18806ef85bc7c16ba29f72f6':
Handle change from push to other intervals properly (#2165032)
