Merge commit 'ebe7f6796d517470d48f4dd3b39c44a8a8f120c3'
* commit 'ebe7f6796d517470d48f4dd3b39c44a8a8f120c3':
Allow sync data to arrive via the chunked transfer encoding.
Merge commit 'ccd29c33ed9b95eb69a1b769c53d9a8965888e9f' into eclair-mr2-plus-aosp
* commit 'ccd29c33ed9b95eb69a1b769c53d9a8965888e9f':
Allow sync data to arrive via the chunked transfer encoding.
* Fixes#2216885
* The bug is that the sync adapters weren't set up to handle chunked
encoding, primarily because 1) I hadn't seen any servers use it, and
2) when we changed from HttpUrlConnection to HttpClient, support for
chunked wasn't added (HttpUrlConnection didn't support it)
* The fix for xml data is trivial, since the Content-Length returned in
the chunked case (-1) was being disallowed, but works perfectly well
with HttpClient.
* The fix for attachments is less trivial, but still straightforward.
* With this change, we are no longer dependent on receiving content-length,
which is highly desirable
Change-Id: Ie3bd6af0cf68f3afa190711d96b1dbd2e6341f79
Merge commit '85f9f2a2624494bd8c2d781756d633822f79b7d1' into eclair-mr2-plus-aosp
* commit '85f9f2a2624494bd8c2d781756d633822f79b7d1':
Fix folder deletion; support folder rename (#2118439) DO NOT MERGE
Merge commit '68942b93a49c4bfed972ee0b5cffd301cebdacc8' into eclair-plus-aosp
* commit '68942b93a49c4bfed972ee0b5cffd301cebdacc8':
Fix folder deletion; support folder rename (#2118439) DO NOT MERGE
Merge commit '68942b93a49c4bfed972ee0b5cffd301cebdacc8' into eclair-mr2
* commit '68942b93a49c4bfed972ee0b5cffd301cebdacc8':
Fix folder deletion; support folder rename (#2118439) DO NOT MERGE
* The fix to bug #2191778 inadvertently broke attachment loading for
Exchange 2003 servers; the server responds with a 403 error (indicating
an authentication issue)
* All other communications with the server work properly
* We use a slightly different set of calls in the case of attachments (we
wanted to change as little as possible in the fix to #2191778) than we
do in the other cases
* The fix here is to use the same calling sequence for attachments that we
use elsewhere
* This fix has been observed to work on multiple servers, and in various
SSL scenarios (on/off, trusted/untrusted)
Change-Id: Ie2804ddcbfa2b10edff42f7a3811734c325e933d
Merge commit '1382dca58578de2d880023296268feeefb0402ce' into eclair-mr2-plus-aosp
* commit '1382dca58578de2d880023296268feeefb0402ce':
Import revised translations. DO NOT MERGE
Merge commit 'bb17f149abe263b36eaab1125e12ea266a60306a' into eclair-mr2
* commit 'bb17f149abe263b36eaab1125e12ea266a60306a':
Import revised translations. DO NOT MERGE
* Folder delete had a subtle error that could cause subsequent folder
changes in the same sync to fail (using wrong end tag)
* Folder change (rename, move) wasn't implemented; this was added and
tested. The change is very straightforward and low risk.
Change-Id: I9733dc5da1a535c388e2feb299a641642ba531c2
* Folder delete had a subtle error that could cause subsequent folder
changes in the same sync to fail (using wrong end tag)
* Folder change (rename, move) wasn't implemented; this was added and
tested. The change is very straightforward and low risk.
Change-Id: Id69cee9b99e9a988a176a6525ba9a1615b741c44
Merge commit '69ee7c0210f5adec205906c3c3ea3ed698a376f7'
* commit '69ee7c0210f5adec205906c3c3ea3ed698a376f7':
Controller: modify the test for "attachment already loaded".
Merge commit '9abd1bf9dabbf5f55b0f84a61d61b031250154bc' into eclair-mr2-plus-aosp
* commit '9abd1bf9dabbf5f55b0f84a61d61b031250154bc':
Controller: modify the test for "attachment already loaded".
Merge commit 'ce81062d3e3a68181101cf12379fb79a3122b1e6'
* commit 'ce81062d3e3a68181101cf12379fb79a3122b1e6':
MessageView: center the presence dot with the From text.
Merge commit '3126629db5bfb2c2ae089913b96b9e0657694be9' into eclair-mr2-plus-aosp
* commit '3126629db5bfb2c2ae089913b96b9e0657694be9':
MessageView: center the presence dot with the From text.
Merge commit 'a62525a3650ab32b71a8bea520127141e09522b3'
* commit 'a62525a3650ab32b71a8bea520127141e09522b3':
Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
Merge commit 'cbfb39b8cc955e1771756a817db53eccd4d8e227'
* commit 'cbfb39b8cc955e1771756a817db53eccd4d8e227':
Server validates even though server address is wrong DO NOT MERGE
Merge commit '8df4528248e6dc72a7a63732c34c4246eddba937' into eclair-mr2-plus-aosp
* commit '8df4528248e6dc72a7a63732c34c4246eddba937':
Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
Merge commit '5ce592f4b250b2649757192358722a1ce49a3775' into eclair-mr2-plus-aosp
* commit '5ce592f4b250b2649757192358722a1ce49a3775':
Server validates even though server address is wrong DO NOT MERGE
Merge commit '0054c1a9e699e5c90daed6fd0a30ffc8aec3955e' into eclair-mr2
* commit '0054c1a9e699e5c90daed6fd0a30ffc8aec3955e':
Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
Merge commit '2533132c84b9721b9692b284bbb14e5e0d237237' into eclair-mr2
* commit '2533132c84b9721b9692b284bbb14e5e0d237237':
Server validates even though server address is wrong DO NOT MERGE
Merge commit 'bb17f149abe263b36eaab1125e12ea266a60306a' into eclair-plus-aosp
* commit 'bb17f149abe263b36eaab1125e12ea266a60306a':
Import revised translations. DO NOT MERGE
Merge commit '0054c1a9e699e5c90daed6fd0a30ffc8aec3955e' into eclair-plus-aosp
* commit '0054c1a9e699e5c90daed6fd0a30ffc8aec3955e':
Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
Merge commit '2533132c84b9721b9692b284bbb14e5e0d237237' into eclair-plus-aosp
* commit '2533132c84b9721b9692b284bbb14e5e0d237237':
Server validates even though server address is wrong DO NOT MERGE
* The problem is that PendingIntents aren't updated when a notification
is updated, so the changed extras when a 2nd account gets a new message
aren't seen by MessageList when it's started up upon tapping the
notification (it uses the extras from the 1st account to get a new
message)
* The fix is to use the newish (cupcake) flag in the PendingIntent that
causes the extras in the PendingIntent to be updated
Change-Id: If12d0e7c6d3f256befeca98b560443395820737f
