Commit Graph

1118 Commits

Author SHA1 Message Date
satok
9151d86e68 Check null pointer in MessageList
BUG: 2299971
2009-12-16 16:26:20 +09:00
Android (Google) Code Review
3c1334ae1f Merge change I915b13a6 into eclair-mr2
* changes:
  Fix MessageListUnitTests
2009-12-09 17:44:48 -08:00
Fred Quintana
052eefe406 changed to use the new EntityIterator interface 2009-12-09 10:30:58 -08:00
Android (Google) Code Review
7a4b1c72f6 Merge change I146f63ab into eclair-mr2
* changes:
  Don't delete referenced messages from the Exchange server
2009-12-07 21:31:42 -08:00
Marc Blank
c29e435eb3 Don't delete referenced messages from the Exchange server
* Addresses #2287439 incompletely
* The most likely reason for a reply/forward to get stuck in the Outbox
  is that the referenced message has been deleted from the client, with
  the deletion occuring BEFORE the message gets sent (currently, the two
  are completely independent)
* This change causes deletes NOT to be sent to the server if the message
  to be deleted is referenced by an outgoing message

Change-Id: I146f63ab345c07e684790e1d7d1fc08870468bbf
2009-12-07 21:30:59 -08:00
Marc Blank
0e1595c177 Handle unexpected deletion of EmailProvider database
* Addresses #2226426
* If the user deletes Email data, or if data corruption causes
  EmailProvider.db to be deleted, we will be in an inconsistent
  state with any existing Exchange accounts, since the AccountManager
  will still know about them, contacts (and eventually calendar) items will
  continue to exist, etc.
* Run an integrity check when the provider is created, deleting any
  orphaned EmailProvider.db or EmailProviderBody.db
* Catch SQLiteException's in the Provider and do an integrity check
  if any is caught

Change-Id: I47d523b90a6b8f71ba8e13fba4b04846b3da1b1d
2009-12-07 21:12:57 -08:00
satok
3d00377b35 Fix MessageListUnitTests
This is supperement of change,33265

* Move custom cursor to inner static class
* Change public to /* package */
* Move PROJECTION to a package
2009-12-08 13:36:32 +09:00
Android (Google) Code Review
ecfc9e92e5 Merge change Icba56688 into eclair-mr2
* changes:
  Ensure that service calls run outside the UI thread (#2235734)
2009-12-07 19:00:02 -08:00
Andrew Stadler
baf739ebdb am fdfdd73c: (-s ours) DO NOT MERGE. Improve colors of read/unread messages.
Merge commit 'fdfdd73cebd29806e1512f03d6d6ff2a349b10ac' into eclair-mr2

* commit 'fdfdd73cebd29806e1512f03d6d6ff2a349b10ac':
  DO NOT MERGE.  Improve colors of read/unread messages.
2009-12-07 16:13:56 -08:00
Andrew Stadler
fdfdd73ceb DO NOT MERGE. Improve colors of read/unread messages.
Backport of 47da97527b547da97527b5bbecba972e0c6a5d382cd7b0768e9.
Original comment:
  Improve visible difference between read and unread messages
  BUG: 2168155
2009-12-07 13:58:41 -08:00
Android (Google) Code Review
3af9f4cbf3 Merge change I9bec1244 into eclair-mr2
* changes:
  Fix #2300147 (mistakenly reporting connection error)
2009-12-07 10:19:23 -08:00
Vasu Nori
b720ed3183 revert previously submitted CL 34143.
turns out the change I submitted before is not required at all. I mistakenly
assumed sqlite wouldn't be able to handle it. but tested it with the latest
version of sqlite 3.6.20. the old style triggers work fine.
2009-12-03 18:32:58 -08:00
Marc Blank
d3da948c31 Fix #2300147 (mistakenly reporting connection error)
* When a mailbox sync is stopped intentionally (for example, if account
  settings change), we report a connection error by mistake
* Handle this case properly, reporting "success" (i.e. no error state)
* Remove obsolete comment

Change-Id: I9bec1244267cd2240c369b9b7f905948381a0f91
2009-12-03 09:58:56 -08:00
Jim Miller
dbd49f026f am 6d69fb7c: Fix 2266119: Simplify account creation strings and remove translation requirement
Merge commit '6d69fb7c577f49558e8431564e3700913a9c1ac5' into eclair-mr2

* commit '6d69fb7c577f49558e8431564e3700913a9c1ac5':
  Fix 2266119: Simplify account creation strings and remove translation requirement
2009-12-02 19:04:52 -08:00
Jim Miller
6d69fb7c57 Fix 2266119: Simplify account creation strings and remove translation requirement
This removes the word "account" to eliminate the need for translation and to simplify
the use of overlays for vendors that need to customize these strings.
2009-12-02 18:58:55 -08:00
Eric Fischer
3d32f56217 am 59057917: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '5905791775e7e431135bda21969b9e5efd24de62' into eclair-mr2

* commit '5905791775e7e431135bda21969b9e5efd24de62':
  Import revised translations.  DO NOT MERGE
2009-12-02 15:07:33 -08:00
Marc Blank
3379c51569 Ensure that service calls run outside the UI thread (#2235734)
Change-Id: Icba566884f3b994c8a4ccc4b8658c40b133a3509
2009-12-02 15:01:06 -08:00
Eric Fischer
5905791775 Import revised translations. DO NOT MERGE 2009-12-02 14:56:24 -08:00
Android (Google) Code Review
98796942ea Merge change I8e09bde5 into eclair-mr2
* changes:
  change BEFORE triggers to AFTER triggers - to make them work with sqlite 3.6.20 and beyond
2009-12-02 14:42:46 -08:00
Eric Fischer
c2b42a4d67 am ddc69f42: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'ddc69f42482cf991562052c24d95a018fbce8c61' into eclair-mr2

* commit 'ddc69f42482cf991562052c24d95a018fbce8c61':
  Import revised translations.  DO NOT MERGE
2009-12-01 17:06:17 -08:00
satok
4cb25d93a2 Save the state of checkboxes when orientation is changed
BUG: 2239516

* Add tests for save/restore Instance State
2009-12-01 15:41:10 +09:00
Eric Fischer
ddc69f4248 Import revised translations. DO NOT MERGE 2009-11-30 11:35:56 -08:00
Vasu Nori
8e09bde568 change BEFORE triggers to AFTER triggers - to make them work with sqlite 3.6.20 and beyond 2009-11-25 15:38:42 -08:00
Marc Blank
5660af68e9 am d457c744: Merge change Ic1a2e5b9 into eclair
Merge commit 'd457c744cde468c3bd9b92f28a140379c714f540' into eclair-mr2

* commit 'd457c744cde468c3bd9b92f28a140379c714f540':
  Fix improper constant to allow retry for sending Exchange mail
2009-11-20 13:36:31 -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
6ba40085d7 am 863e6c40: Handle "send outgoing messages" properly for combined Outbox
Merge commit '863e6c40202fe804d92a263809da74ec1e904e66' into eclair-mr2

* commit '863e6c40202fe804d92a263809da74ec1e904e66':
  Handle "send outgoing messages" properly for combined Outbox
2009-11-20 09:56:03 -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
Android (Google) Code Review
6128baf612 Merge change I6002ed3b into eclair-mr2
* changes:
  Improve visible difference between read and unread messages
2009-11-20 00:08:32 -08:00
satok
47da97527b Improve visible difference between read and unread messages
BUG: 2168155
2009-11-20 17:06:40 +09:00
Marc Blank
bdb28c1644 Fix #2267475 (NPE when changing incoming settings for EAS)
* When settings are changed, we loop through the sync error map,
  clearing mailboxes in the changed account that are in an error
  state.
* It's possible that there are mailboxes referenced in the map that
  no longer exist.  When trying to retrieve them from the provider,
  null is returned, but we're not checking for this case, and an
  NPE results.
* The fix is simply to check for null, and clear the error map for
  the mailboxId that references a deleted mailbox

Change-Id: I8c1c847090026fa1c53b09bbe6b12d864bce4df1
2009-11-19 09:01:06 -08:00
Android (Google) Code Review
6b93f61eea Merge change Ib35bb866 into eclair-mr2
* changes:
  Don't allow "trash" to be synced (Fixes #2116463)
2009-11-19 08:57:39 -08:00
Marc Blank
6daaf76459 Don't allow "trash" to be synced (Fixes #2116463)
Change-Id: Ib35bb86641b473194fea32b55db328a44de1c67b
2009-11-18 17:20:44 -08:00
Dan Egnor
2da2e4632d Change android.text.util.Regex to com.android.common.Patterns 2009-11-18 12:11:55 -08:00
Elliott Hughes
b1487a2030 DO NOT MERGE: Back-port 2249953 fix (for email unbundling).
Original check-in comment:
Move the org.kxml2.wap.Wbxml class into the EAS code, the only user.

Dr No approval: danfuzz
2009-11-16 13:26:18 -08:00
Eric Fischer
e2ea3e4f87 am 743b143d: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c' into eclair-mr2

* commit '743b143d0e06c7d3b8d8a28e9da3959649a2977c':
  Import revised translations.  DO NOT MERGE
2009-11-13 17:51:00 -08:00
Eric Fischer
743b143d0e Import revised translations. DO NOT MERGE
Approver: jerryw
2009-11-13 17:21:24 -08:00
Eric Fischer
0a68553ae6 am bf67508d: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'bf67508d167339f303f2b9985516af3aa01aee51' into eclair-mr2

* commit 'bf67508d167339f303f2b9985516af3aa01aee51':
  Import revised translations.  DO NOT MERGE
2009-11-13 10:37:13 -08:00
Eric Fischer
bf67508d16 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-11-12 19:48:23 -08:00
Marc Blank
1988779570 am 83b67e61: (-s ours) Fix #2251837; better response w/ security req\'d. DO NOT MERGE
Merge commit '83b67e61989b5ca61be4754272618bc51b42cb47' into eclair-mr2

* commit '83b67e61989b5ca61be4754272618bc51b42cb47':
  Fix #2251837; better response w/ security req'd. DO NOT MERGE
2009-11-11 17:14:15 -08:00
Marc Blank
a08e88cd78 Fix wording of security dialog per Roy West
Change-Id: I4704d62535e8046a7a174ee0f353627990c97265
2009-11-11 14:46:19 -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
29935abb1c 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
2009-11-10 16:29:10 -08:00
Eric Fischer
93517e94ae Import revised translations. DO NOT MERGE 2009-11-06 15:27:24 -08:00
Marc Blank
2df576f14b am 151ebde5: (-s ours) 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
2009-11-05 19:09:31 -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
038be0fc4d am c5ec3d0b: Merge change I2eee4ddc into eclair
Merge commit 'c5ec3d0bce03de10c4bb1bc5cf013494c6d62947' into eclair-mr2

* commit 'c5ec3d0bce03de10c4bb1bc5cf013494c6d62947':
  Improved fix for #2189704 (sync loss)
2009-11-04 14:53:35 -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
9baaa12f50 am 1b21ad4d: (-s ours) Import corrected translations. DO NOT MERGE
Merge commit '1b21ad4d4b548784b6974696551c880b1c2eae9d' into eclair-mr2

* commit '1b21ad4d4b548784b6974696551c880b1c2eae9d':
  Import corrected translations.  DO NOT MERGE
2009-11-02 23:31:38 -08:00