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 '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 '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 '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
* 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 '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-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 '9abd1bf9dabbf5f55b0f84a61d61b031250154bc' into eclair-mr2-plus-aosp
* commit '9abd1bf9dabbf5f55b0f84a61d61b031250154bc':
Controller: modify the test for "attachment already loaded".
Merge commit '3126629db5bfb2c2ae089913b96b9e0657694be9' into eclair-mr2-plus-aosp
* commit '3126629db5bfb2c2ae089913b96b9e0657694be9':
MessageView: center the presence dot with the From text.
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
