Commit Graph

1234 Commits

Author SHA1 Message Date
Eric Fischer
e3ce4c29b3 am 59057917: Import revised translations. DO NOT MERGE
Merge commit '5905791775e7e431135bda21969b9e5efd24de62' into eclair-plus-aosp

* commit '5905791775e7e431135bda21969b9e5efd24de62':
  Import revised translations.  DO NOT MERGE
2009-12-02 15:06:30 -08:00
Eric Fischer
5905791775 Import revised translations. DO NOT MERGE 2009-12-02 14:56:24 -08:00
Eric Fischer
e66549c97d am ddc69f42: Import revised translations. DO NOT MERGE
Merge commit 'ddc69f42482cf991562052c24d95a018fbce8c61' into eclair-plus-aosp

* commit 'ddc69f42482cf991562052c24d95a018fbce8c61':
  Import revised translations.  DO NOT MERGE
2009-11-30 11:59:41 -08:00
Eric Fischer
ddc69f4248 Import revised translations. DO NOT MERGE 2009-11-30 11:35:56 -08:00
Jean-Baptiste Queru
ee0c01548e merge from open-source master 2009-11-24 09:12:36 -08:00
Marc Blank
5e353e3f77 am d457c744: Merge change Ic1a2e5b9 into eclair
Merge commit 'd457c744cde468c3bd9b92f28a140379c714f540' into eclair-plus-aosp

* commit 'd457c744cde468c3bd9b92f28a140379c714f540':
  Fix improper constant to allow retry for sending Exchange mail
2009-11-20 13:36:30 -08:00
Android (Google) Code Review
d457c744cd Merge change Ic1a2e5b9 into eclair
* changes:
  Fix improper constant to allow retry for sending Exchange mail
2009-11-20 13:32:59 -08:00
Marc Blank
eec04663fe Fix improper constant to allow retry for sending Exchange mail
* Related to MR1 triaged bug 2274389 in which mail was stuck in the
  Outbox and wouldn't send
* It turns out an improper constant was being used in the SQL code
  for turning off the "error" state flag

Change-Id: Ic1a2e5b9dd34ec3f9d7da0b3d2cd63d77bb7681e
2009-11-20 12:10:23 -08:00
Marc Blank
52b06a1de6 am 863e6c40: Handle "send outgoing messages" properly for combined Outbox
Merge commit '863e6c40202fe804d92a263809da74ec1e904e66' into eclair-plus-aosp

* commit '863e6c40202fe804d92a263809da74ec1e904e66':
  Handle "send outgoing messages" properly for combined Outbox
2009-11-20 09:54:44 -08:00
Marc Blank
863e6c4020 Handle "send outgoing messages" properly for combined Outbox
* The "send outgoing messages" button doesn't work in the combined
  inbox (the case wasn't handled)
* Add code to loop through accounts, calling the Controller for each
  in this case
* Fixes (partially or completely) #2274389

Change-Id: I94e984247d43f93a4d6546b8c10f6ce149b091be
2009-11-20 09:46:35 -08:00
Elliott Hughes
5e062514bf Move the org.kxml2.wap.Wbxml class into the EAS code, the only user.
(I notice that you already have, for example, an END constant, but with
a different value. Bug?)

Bug: 2249953
2009-11-17 15:10:40 -08:00
Jean-Baptiste Queru
feafc728c3 merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15 14:06:39 -08:00
Jean-Baptiste Queru
76f193a16f merge from eclair 2009-11-15 12:06:47 -08:00
Eric Fischer
4372e0df9c am 743b143d: Import revised translations. DO NOT MERGE
Merge commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c' into eclair-plus-aosp

* commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c':
  Import revised translations.  DO NOT MERGE
2009-11-13 17:49:51 -08:00
Eric Fischer
743b143d0e Import revised translations. DO NOT MERGE
Approver: jerryw
2009-11-13 17:21:24 -08:00
Eric Fischer
16ff4c4d36 am bf67508d: Import revised translations. DO NOT MERGE
Merge commit 'bf67508d167339f303f2b9985516af3aa01aee51' into eclair-plus-aosp

* commit 'bf67508d167339f303f2b9985516af3aa01aee51':
  Import revised translations.  DO NOT MERGE
2009-11-13 10:34:07 -08:00
Eric Fischer
bf67508d16 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-11-12 19:48:23 -08:00
Jean-Baptiste Queru
56e48981f0 eclair snapshot 2009-11-12 18:46:09 -08:00
Marc Blank
9b69d107ab am 83b67e61: Fix #2251837; better response w/ security req\'d. DO NOT MERGE
Merge commit '83b67e61989b5ca61be4754272618bc51b42cb47' into eclair-plus-aosp

* commit '83b67e61989b5ca61be4754272618bc51b42cb47':
  Fix #2251837; better response w/ security req'd. DO NOT MERGE
2009-11-11 14:44:28 -08:00
Marc Blank
83b67e6198 Fix #2251837; better response w/ security req'd. DO NOT MERGE
* 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
2009-11-11 14:40:35 -08:00
Marc Blank
c2e7442eb3 am 151ebde5: 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
2009-11-05 16:23:04 -08:00
Marc Blank
151ebde5d1 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
2009-11-04 18:11:24 -08:00
Marc Blank
a3423a2d36 am c5ec3d0b: Merge change I2eee4ddc into eclair
Merge commit 'c5ec3d0bce03de10c4bb1bc5cf013494c6d62947' into eclair-plus-aosp

* commit 'c5ec3d0bce03de10c4bb1bc5cf013494c6d62947':
  Improved fix for #2189704 (sync loss)
2009-11-04 14:53:11 -08:00
Android (Google) Code Review
c5ec3d0bce Merge change I2eee4ddc into eclair
* changes:
  Improved fix for #2189704 (sync loss)
2009-11-04 17:45:11 -05:00
Marc Blank
d676ab6a98 Improved fix for #2189704 (sync loss)
* 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
2009-11-03 18:11:02 -08:00
Eric Fischer
88a455115e am 1b21ad4d: Import corrected translations. DO NOT MERGE
Merge commit '1b21ad4d4b548784b6974696551c880b1c2eae9d' into eclair-plus-aosp

* commit '1b21ad4d4b548784b6974696551c880b1c2eae9d':
  Import corrected translations.  DO NOT MERGE
2009-11-02 23:30:52 -08:00
Eric Fischer
1b21ad4d4b Import corrected translations. DO NOT MERGE
Bug 2195208
2009-11-02 23:20:12 -08:00
Marc Blank
c5c1250d1e am 1e1d7cb1: Merge change Ie2804ddc into eclair
Merge commit '1e1d7cb189e7ea7164d1335539d68d3d3ca8c0e5' into eclair-plus-aosp

* commit '1e1d7cb189e7ea7164d1335539d68d3d3ca8c0e5':
  Fix #2225869 (Regression in attachment loading / Exchange 2003)
2009-10-30 14:33:55 -07:00
Android (Google) Code Review
1e1d7cb189 Merge change Ie2804ddc into eclair
* changes:
  Fix #2225869 (Regression in attachment loading / Exchange 2003)
2009-10-30 17:26:46 -04:00
Marc Blank
f6bdeb5f29 am 68942b93: Merge change I9733dc5d into eclair
Merge commit '68942b93a49c4bfed972ee0b5cffd301cebdacc8' into eclair-plus-aosp

* commit '68942b93a49c4bfed972ee0b5cffd301cebdacc8':
  Fix folder deletion; support folder rename (#2118439) DO NOT MERGE
2009-10-30 11:01:32 -07:00
Android (Google) Code Review
68942b93a4 Merge change I9733dc5d into eclair
* changes:
  Fix folder deletion; support folder rename (#2118439) DO NOT MERGE
2009-10-30 13:54:55 -04:00
Marc Blank
05dfc20853 Fix #2225869 (Regression in attachment loading / Exchange 2003)
* 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
2009-10-29 20:10:46 -07:00
Marc Blank
94d2e99581 Fix folder deletion; support folder rename (#2118439) 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
2009-10-29 12:19:57 -07:00
Eric Fischer
1b0611cced am bb17f149: Import revised translations. DO NOT MERGE
Merge commit 'bb17f149abe263b36eaab1125e12ea266a60306a' into eclair-plus-aosp

* commit 'bb17f149abe263b36eaab1125e12ea266a60306a':
  Import revised translations.  DO NOT MERGE
2009-10-28 23:33:14 -07:00
Eric Fischer
bb17f149ab Import revised translations. DO NOT MERGE 2009-10-28 21:18:16 -07:00
Marc Blank
0386c563d0 am 0054c1a9: Merge change If12d0e7c into eclair
Merge commit '0054c1a9e699e5c90daed6fd0a30ffc8aec3955e' into eclair-plus-aosp

* commit '0054c1a9e699e5c90daed6fd0a30ffc8aec3955e':
  Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
2009-10-28 11:04:36 -07:00
Marc Blank
259386b10b am 2533132c: Merge change Ic29d3eac into eclair
Merge commit '2533132c84b9721b9692b284bbb14e5e0d237237' into eclair-plus-aosp

* commit '2533132c84b9721b9692b284bbb14e5e0d237237':
  Server validates even though server address is wrong DO NOT MERGE
2009-10-28 11:04:30 -07:00
Marc Blank
28f8d9ad58 am ea5b93d9: Handle moreAvailable true w/o changes (#2189704) DO NOT MERGE
Merge commit 'ea5b93d9b825e17eddf7f34cd37abef98e9949bd' into eclair-plus-aosp

* commit 'ea5b93d9b825e17eddf7f34cd37abef98e9949bd':
  Handle moreAvailable true w/o changes (#2189704) DO NOT MERGE
2009-10-28 11:04:25 -07:00
Android (Google) Code Review
0054c1a9e6 Merge change If12d0e7c into eclair
* changes:
  Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
2009-10-28 13:56:10 -04:00
Android (Google) Code Review
2533132c84 Merge change Ic29d3eac into eclair
* changes:
  Server validates even though server address is wrong DO NOT MERGE
2009-10-28 13:55:43 -04:00
Marc Blank
5d4bb79044 Go to combined inbox on notify for 2+ accounts (#2147265) 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
2009-10-28 08:57:45 -07:00
Marc Blank
e53de6985a Server validates even though server address is wrong DO NOT MERGE
* Fixes #2173664
* Make sure that not only is the OPTIONS command accepted, but that
  the server reports EAS versions and commands

Change-Id: Ic29d3eacfdc54d107600afc443964a1e8b3d5e59
2009-10-28 08:53:57 -07:00
Marc Blank
ea5b93d9b8 Handle moreAvailable true w/o changes (#2189704) DO NOT MERGE
* An Exchange log from Moto has shown sync behavior in which moreAvailable
  is set to true even though there are no changes in the sync response
  (i.e. the SyncKey is unchanged)
* This leads to long-lived looping which impacts battery life
* The fix is to recognize the behavior and prevent looping by
  setting moreAvailable = false

Change-Id: Icf45efbc24331c874c820b7b177e39b16df445d8
2009-10-22 14:49:26 -07:00
Eric Fischer
c607f8c251 am ba2d6de4: Import revised translations. DO NOT MERGE
Merge commit 'ba2d6de4b706cd226d0eb7910fef7ec77866d831' into eclair-plus-aosp

* commit 'ba2d6de4b706cd226d0eb7910fef7ec77866d831':
  Import revised translations.  DO NOT MERGE
2009-10-21 12:12:34 -07:00
Eric Fischer
ba2d6de4b7 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-21 10:44:46 -07:00
Marc Blank
90499a5415 am 55a97fc3: Fix attachment loading with "accept certificates" checked
Merge commit '55a97fc360ac549631af3aa3aad9833812674562' into eclair-plus-aosp

* commit '55a97fc360ac549631af3aa3aad9833812674562':
  Fix attachment loading with "accept certificates" checked
2009-10-19 10:41:05 -07:00
Marc Blank
55a97fc360 Fix attachment loading with "accept certificates" checked
* Fixes #2191778 (P1/S1)
* Attachment retrieval wasn't using newer code to create its
  HttpClient.
* Fix is simple, extremely safe

Change-Id: I65be27decae8719bbad8ac7dce1c1164de4371a5
2009-10-19 10:34:10 -07:00
Andrew Stadler
21d9337a13 am 53123c2f: DO NOT MERGE. Prevent duplication of POP3 attachments
Merge commit '53123c2f914db357fa5b4a8451b23c6be77314a5' into eclair-plus-aosp

* commit '53123c2f914db357fa5b4a8451b23c6be77314a5':
  DO NOT MERGE. Prevent duplication of POP3 attachments
2009-10-14 15:50:15 -07:00
Andrew Stadler
53123c2f91 DO NOT MERGE. Prevent duplication of POP3 attachments
* For each attachment we add, check the DB for an existing attachment
  with similar metadata (name, mime type, content id, etc.)
* Skip adding them if already held
* Unit tests

Originally fixed in 5b0a12c199 / CL I036f39c6

Fixes bug http://b/2084704
2009-10-14 12:41:05 -07:00
Andrew Stadler
185b795d40 am dee4e253: Do not trust server-provided content type for attachments
Merge commit 'dee4e25320c5154a5626446e1aa37f63ae97c48c' into eclair-plus-aosp

* commit 'dee4e25320c5154a5626446e1aa37f63ae97c48c':
  Do not trust server-provided content type for attachments
2009-10-13 21:19:28 -07:00