Merge commit 'e2ea3e4f878a7005aeef77a7f7e2f0f2519cdc15' into eclair-mr2-plus-aosp
* commit 'e2ea3e4f878a7005aeef77a7f7e2f0f2519cdc15':
Import revised translations. DO NOT MERGE
Merge commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c' into eclair-mr2
* commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c':
Import revised translations. DO NOT MERGE
Merge commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c' into eclair-plus-aosp
* commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c':
Import revised translations. DO NOT MERGE
Merge commit '0a68553ae6b7e125587ed7c525afb7fc1d128ccc' into eclair-mr2-plus-aosp
* commit '0a68553ae6b7e125587ed7c525afb7fc1d128ccc':
Import revised translations. DO NOT MERGE
Merge commit 'bf67508d167339f303f2b9985516af3aa01aee51' into eclair-mr2
* commit 'bf67508d167339f303f2b9985516af3aa01aee51':
Import revised translations. DO NOT MERGE
Merge commit 'bf67508d167339f303f2b9985516af3aa01aee51' into eclair-plus-aosp
* commit 'bf67508d167339f303f2b9985516af3aa01aee51':
Import revised translations. DO NOT MERGE
Merge commit 'b12f46e04b7c12d34245b78a76be50e7741fc06d'
* commit 'b12f46e04b7c12d34245b78a76be50e7741fc06d':
Fix wording of security dialog per Roy West
Merge commit 'a08e88cd787f714f89d2ac016aa1272311a7b4c6' into eclair-mr2-plus-aosp
* commit 'a08e88cd787f714f89d2ac016aa1272311a7b4c6':
Fix wording of security dialog per Roy West
* Currently, we validate EAS accounts using a command that will
succeed even if we do not support required security policies.
* This causes a confusing "invalid username or password" error
when trying to sync with a validated account in the case that
there are, in fact, required policies
* The fix is to send a sync command after validating the user name
and password; a 403 error indicates the requirement for
security policies.
* When we see the 403 error, we put up a message that is appropriate
to the situation.
Change-Id: I74e132cb81f021cbb697cc9ee146405bf3ebc0ba
Merge commit '29935abb1cbb64ffa232daefeaae7ecc4541722b' into eclair-mr2-plus-aosp
* commit '29935abb1cbb64ffa232daefeaae7ecc4541722b':
Fix#2251837; better response when provisioning is required.
* Currently, we validate EAS accounts using a command that will
succeed even if we do not support required security policies.
* This causes a confusing "invalid username or password" error
when trying to sync with a validated account in the case that
there are, in fact, required policies
* The fix is to send a sync command after validating the user name
and password; a 403 error indicates the requirement for
security policies.
* When we see the 403 error, we put up a message that is appropriate
to the situation.
Change-Id: Ic40820253dca1f357297b2355ad987bc39d0775f
Merge commit '93517e94aea74f8ec5f8aed74b0b655ec5c0fd5c' into eclair-mr2-plus-aosp
* commit '93517e94aea74f8ec5f8aed74b0b655ec5c0fd5c':
Import revised translations. DO NOT MERGE
Merge commit '2dc97e3803b6270f90309455f9c06ad8b33c9d30'
* commit '2dc97e3803b6270f90309455f9c06ad8b33c9d30':
Allow sync data via the chunked transfer encoding DO NOT MERGE
Merge commit '2df576f14bf69c807304722f2dda61d86b0de18c' into eclair-mr2-plus-aosp
* commit '2df576f14bf69c807304722f2dda61d86b0de18c':
Allow sync data via the chunked transfer encoding DO NOT MERGE
Merge commit '151ebde5d1135ca7b50ffd97df14cda5d3282477' into eclair-mr2
* commit '151ebde5d1135ca7b50ffd97df14cda5d3282477':
Allow sync data via the chunked transfer encoding DO NOT MERGE
Merge commit '151ebde5d1135ca7b50ffd97df14cda5d3282477' into eclair-plus-aosp
* commit '151ebde5d1135ca7b50ffd97df14cda5d3282477':
Allow sync data via the chunked transfer encoding DO NOT MERGE
* 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: I8d46790e41eaeee2887c8a207006c5d6786498ed
* The prior fix prevented looping in the case that a new sync key wasn't
received.
* Unfortunately, the prior fix tested for the looping condition (moreAvailable)
before it would have been set.
* The correct fix is to detect the looping condition after both the sync key
and the moreAvailable flag are guaranteed to have been set
Change-Id: I2eee4ddc123fb2a5ce4ef3bd4e7d0614fcfbdf36
Merge commit '9baaa12f50fd7cf9d9c0f9fef2f38df85e6284f6' into eclair-mr2-plus-aosp
* commit '9baaa12f50fd7cf9d9c0f9fef2f38df85e6284f6':
Import corrected translations. DO NOT MERGE
Merge commit '1b21ad4d4b548784b6974696551c880b1c2eae9d' into eclair-mr2
* commit '1b21ad4d4b548784b6974696551c880b1c2eae9d':
Import corrected translations. DO NOT MERGE
Merge commit '1b21ad4d4b548784b6974696551c880b1c2eae9d' into eclair-plus-aosp
* commit '1b21ad4d4b548784b6974696551c880b1c2eae9d':
Import corrected translations. DO NOT MERGE
Merge commit 'ebe7f6796d517470d48f4dd3b39c44a8a8f120c3'
* commit 'ebe7f6796d517470d48f4dd3b39c44a8a8f120c3':
Allow sync data to arrive via the chunked transfer encoding.
Android (Google) Code Review