Commit Graph

2075 Commits

Author SHA1 Message Date
Marc Blank 1c35f546aa am 319dd10f: am 4a7a50f6: Fix potential NPE in earlier CL
Merge commit '319dd10f4fd0851f33e49888cbc797ffa2bb5891'

* commit '319dd10f4fd0851f33e49888cbc797ffa2bb5891':
  Fix potential NPE in earlier CL
2009-12-14 18:18:47 -08:00
Marc Blank 319dd10f4f am 4a7a50f6: Fix potential NPE in earlier CL
Merge commit '4a7a50f6a694c3d57cb18ee8011c473851b065a8' into eclair-mr2-plus-aosp

* commit '4a7a50f6a694c3d57cb18ee8011c473851b065a8':
  Fix potential NPE in earlier CL
2009-12-14 17:20:48 -08:00
Marc Blank 4a7a50f6a6 Fix potential NPE in earlier CL
* Noted this problem in reviewing a newer CL
* Fix is to add a check in setupService

Change-Id: Ia4d71365f8036aac8bf531b835b184dabfbc06fa
2009-12-14 17:17:30 -08:00
Marc Blank 7afaaf2b89 am 01f27166: am d2481f95: Merge change I768138b6 into eclair-mr2
Merge commit '01f2716666f0c79a42b65b6ce9d68b6bb85073c6'

* commit '01f2716666f0c79a42b65b6ce9d68b6bb85073c6':
  Fix delay sending stuck mail after tapping "Send outgoing mail"
2009-12-11 15:56:29 -08:00
Marc Blank 01f2716666 am d2481f95: Merge change I768138b6 into eclair-mr2
Merge commit 'd2481f95f2707c2f0f6589d65e8f9efeb3fba47a' into eclair-mr2-plus-aosp

* commit 'd2481f95f2707c2f0f6589d65e8f9efeb3fba47a':
  Fix delay sending stuck mail after tapping "Send outgoing mail"
2009-12-11 15:53:30 -08:00
Android (Google) Code Review d2481f95f2 Merge change I768138b6 into eclair-mr2
* changes:
  Fix delay sending stuck mail after tapping "Send outgoing mail"
2009-12-11 15:49:28 -08:00
Marc Blank 6cadbc1632 am d4ecce95: am 4848aa2a: Merge change I9a3d501a into eclair-mr2
Merge commit 'd4ecce95f513e3567f5c1be550d86d6a90e7ca63'

* commit 'd4ecce95f513e3567f5c1be550d86d6a90e7ca63':
  Run MailboxAlarmReceiver's code in a background thread
2009-12-11 13:13:26 -08:00
Marc Blank d4ecce95f5 am 4848aa2a: Merge change I9a3d501a into eclair-mr2
Merge commit '4848aa2a1fda59f20e7acb9259dd355a047f3b93' into eclair-mr2-plus-aosp

* commit '4848aa2a1fda59f20e7acb9259dd355a047f3b93':
  Run MailboxAlarmReceiver's code in a background thread
2009-12-11 13:10:27 -08:00
Android (Google) Code Review 4848aa2a1f Merge change I9a3d501a into eclair-mr2
* changes:
  Run MailboxAlarmReceiver's code in a background thread
2009-12-11 13:06:44 -08:00
Marc Blank 079589641a Run MailboxAlarmReceiver's code in a background thread
* Fixes 2313077
* Broadcast receivers are run in the UI thread, so we must ensure that
  any long-running code is executed in a background thread

Change-Id: I9a3d501a308445a84a1baa99fc6abb9feb56ff2d
2009-12-11 13:05:48 -08:00
Marc Blank caf5644360 Fix delay sending stuck mail after tapping "Send outgoing mail"
* Fixes #2317429
* When "Send outgoing messages" is tapped in Outbox MessageList view,
  we clear the error state for all "stuck" messages
* We didn't, however, clear the error state of the Mailbox, which doesn't
  clear itself until the end of a pingLoop, which can be up to 30 minutes
* The fix is in two parts:
  * We clear the error state of the Outbox when a sync is requested by
    the UI
  * We don't set the error state of the mailbox for non-auth errors when
    sending, because we don't want to block OTHER messages from getting sent.

Change-Id: I768138b6f31eb696811aa94f621b6fa758ec1a5e
2009-12-11 10:07:17 -08:00
Marc Blank 6e22729b2e am c6a0605f: am 9b83870a: Merge change I3b505448 into eclair-mr2
Merge commit 'c6a0605f611670bcf44463be5fcb3d35a68165cf'

* commit 'c6a0605f611670bcf44463be5fcb3d35a68165cf':
  Use correct EAS protocol version in Outbox (fixes #2319892)
2009-12-11 09:34:32 -08:00
Marc Blank c6a0605f61 am 9b83870a: Merge change I3b505448 into eclair-mr2
Merge commit '9b83870a091084a3575a354539eaf98c516ccf2c' into eclair-mr2-plus-aosp

* commit '9b83870a091084a3575a354539eaf98c516ccf2c':
  Use correct EAS protocol version in Outbox (fixes #2319892)
2009-12-11 09:32:30 -08:00
Android (Google) Code Review 9b83870a09 Merge change I3b505448 into eclair-mr2
* changes:
  Use correct EAS protocol version in Outbox (fixes #2319892)
2009-12-11 09:28:36 -08:00
Marc Blank 0682b291a4 am 89ecbbae: am e312c12b: Merge change I356b8bfa into eclair-mr2
Merge commit '89ecbbaed6858896c76029803244a7f6c1f13b97'

* commit '89ecbbaed6858896c76029803244a7f6c1f13b97':
  Deal with mismatch between our accounts and AccountManager accounts
2009-12-11 09:11:30 -08:00
Marc Blank 89ecbbaed6 am e312c12b: Merge change I356b8bfa into eclair-mr2
Merge commit 'e312c12b748e9984715295b71e95c90ee8d3d3bd' into eclair-mr2-plus-aosp

* commit 'e312c12b748e9984715295b71e95c90ee8d3d3bd':
  Deal with mismatch between our accounts and AccountManager accounts
2009-12-11 09:09:21 -08:00
Android (Google) Code Review e312c12b74 Merge change I356b8bfa into eclair-mr2
* changes:
  Deal with mismatch between our accounts and AccountManager accounts
2009-12-11 09:05:16 -08:00
Marc Blank 423680653a Deal with mismatch between our accounts and AccountManager accounts
* Addresses #2226426
* Recognize the case in which there is no EmailProvider Account corresponding
  to an AccountManager account (the case being addressed is that of the
  EmailProvider database being deleted due to corruption
* In this case, delete the AccountManager account so that the two are in
  sync
* Refactor and add unit test for account reconciliation

Change-Id: I356b8bfaa0846f85223cc15994b750df207a63ea
2009-12-11 09:04:26 -08:00
Eric Fischer 32d16335ae am f224a6e7: (-s ours) am aec13aba: am 14d3745f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'f224a6e7a0a695cc1b8e24ca70a736e1ac128b7d'

* commit 'f224a6e7a0a695cc1b8e24ca70a736e1ac128b7d':
  Import revised translations.  DO NOT MERGE
2009-12-10 17:59:30 -08:00
Eric Fischer f224a6e7a0 am aec13aba: am 14d3745f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'aec13abacebf0701138b34adce9b21459ede6de5' into eclair-mr2-plus-aosp

* commit 'aec13abacebf0701138b34adce9b21459ede6de5':
  Import revised translations.  DO NOT MERGE
2009-12-10 17:51:39 -08:00
Eric Fischer aec13abace am 14d3745f: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '14d3745f9556232da05c9cd319c097a3e6f791b5' into eclair-mr2

* commit '14d3745f9556232da05c9cd319c097a3e6f791b5':
  Import revised translations.  DO NOT MERGE
2009-12-10 17:41:53 -08:00
satok fef08c4486 am 39790f21: am 3c1334ae: Merge change I915b13a6 into eclair-mr2
Merge commit '39790f2117fde21fe30e6a44a14703edd79be917'

* commit '39790f2117fde21fe30e6a44a14703edd79be917':
  Fix MessageListUnitTests
2009-12-10 14:39:13 -08:00
Marc Blank ec2d0e41b7 Use correct EAS protocol version in Outbox (fixes #2319892)
* We inadvertently failed to set the EAS version in EasOutboxService,
  so the default of 2.5 is used
* This works, but SmartReply/SmartForward were enhanced in 12.0 and we
  aren't taking advantage of those changes
* The fix is to set the version using common code

Change-Id: I3b505448003f340681deeb8fb22e61e9dd8d10a0
2009-12-10 14:11:23 -08:00
Fred Quintana bc404d3a7d am e3362a31: am 052eefe4: changed to use the new EntityIterator interface
Merge commit 'e3362a3163ccc2ce5d93dfaebe35645f368c1863'

* commit 'e3362a3163ccc2ce5d93dfaebe35645f368c1863':
  changed to use the new EntityIterator interface
2009-12-09 18:38:52 -08:00
Marc Blank 9fc07acf2e am ff636171: am 7a4b1c72: Merge change I146f63ab into eclair-mr2
Merge commit 'ff636171da3423ffd66512304f186445abc73398'

* commit 'ff636171da3423ffd66512304f186445abc73398':
  Don't delete referenced messages from the Exchange server
2009-12-09 18:38:48 -08:00
Marc Blank ff3ced0367 am 9dc9f44b: am 0e1595c1: Handle unexpected deletion of EmailProvider database
Merge commit '9dc9f44ba3f771b0eb3399d1360b89e9401a215f'

* commit '9dc9f44ba3f771b0eb3399d1360b89e9401a215f':
  Handle unexpected deletion of EmailProvider database
2009-12-09 18:38:43 -08:00
Marc Blank 914295d39e am 93688620: am ecfc9e92: Merge change Icba56688 into eclair-mr2
Merge commit '936886206bc2566826dc080371b9b86c3ba15ce2'

* commit '936886206bc2566826dc080371b9b86c3ba15ce2':
  Ensure that service calls run outside the UI thread (#2235734)
2009-12-09 18:38:37 -08:00
Andrew Stadler 05accdbd9b am f22c3897: (-s ours) am baf739eb: am fdfdd73c: (-s ours) DO NOT MERGE. Improve colors of read/unread messages.
Merge commit 'f22c389792b9e6674cce3b16418b0d235340ffc3'

* commit 'f22c389792b9e6674cce3b16418b0d235340ffc3':
  DO NOT MERGE.  Improve colors of read/unread messages.
2009-12-09 18:38:31 -08:00
Eric Fischer 3121dc9ca9 am 14d3745f: Import revised translations. DO NOT MERGE
Merge commit '14d3745f9556232da05c9cd319c097a3e6f791b5' into eclair-plus-aosp

* commit '14d3745f9556232da05c9cd319c097a3e6f791b5':
  Import revised translations.  DO NOT MERGE
2009-12-09 18:06:15 -08:00
satok 39790f2117 am 3c1334ae: Merge change I915b13a6 into eclair-mr2
Merge commit '3c1334ae1f6769b55e4728341ef4c2ae3acb9b90' into eclair-mr2-plus-aosp

* commit '3c1334ae1f6769b55e4728341ef4c2ae3acb9b90':
  Fix MessageListUnitTests
2009-12-09 17:47:06 -08:00
Android (Google) Code Review 3c1334ae1f Merge change I915b13a6 into eclair-mr2
* changes:
  Fix MessageListUnitTests
2009-12-09 17:44:48 -08:00
Eric Fischer 14d3745f95 Import revised translations. DO NOT MERGE 2009-12-09 17:25:49 -08:00
Fred Quintana e3362a3163 am 052eefe4: changed to use the new EntityIterator interface
Merge commit '052eefe406c7cedad65ed497f2f1137a1a210a42' into eclair-mr2-plus-aosp

* commit '052eefe406c7cedad65ed497f2f1137a1a210a42':
  changed to use the new EntityIterator interface
2009-12-09 16:00:12 -08:00
Marc Blank ff636171da am 7a4b1c72: Merge change I146f63ab into eclair-mr2
Merge commit '7a4b1c72f6f2e8395dd67af4b00f9f1c1efbb97b' into eclair-mr2-plus-aosp

* commit '7a4b1c72f6f2e8395dd67af4b00f9f1c1efbb97b':
  Don't delete referenced messages from the Exchange server
2009-12-09 15:42:37 -08:00
Marc Blank 9dc9f44ba3 am 0e1595c1: Handle unexpected deletion of EmailProvider database
Merge commit '0e1595c177e40428b267a8696dfc05d015ce6a2f' into eclair-mr2-plus-aosp

* commit '0e1595c177e40428b267a8696dfc05d015ce6a2f':
  Handle unexpected deletion of EmailProvider database
2009-12-09 15:42:33 -08:00
Marc Blank 936886206b am ecfc9e92: Merge change Icba56688 into eclair-mr2
Merge commit 'ecfc9e92e5910fa47f2b6e4d699e951ce81ab99e' into eclair-mr2-plus-aosp

* commit 'ecfc9e92e5910fa47f2b6e4d699e951ce81ab99e':
  Ensure that service calls run outside the UI thread (#2235734)
2009-12-09 15:41:42 -08:00
Andrew Stadler f22c389792 am baf739eb: am fdfdd73c: (-s ours) DO NOT MERGE. Improve colors of read/unread messages.
Merge commit 'baf739ebdbe6d32e0673d699fdf5713b72f5ec6f' into eclair-mr2-plus-aosp

* commit 'baf739ebdbe6d32e0673d699fdf5713b72f5ec6f':
  DO NOT MERGE.  Improve colors of read/unread messages.
2009-12-09 15:41:37 -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
Marc Blank 14d0151268 am 34210419: am 3af9f4cb: Merge change I9bec1244 into eclair-mr2
Merge commit '3421041995f39ed1aaa8ffdb1170cd9bc6ca4c61'

* commit '3421041995f39ed1aaa8ffdb1170cd9bc6ca4c61':
  Fix #2300147 (mistakenly reporting connection error)
2009-12-07 18:33:03 -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 8ebf6c51a2 am fdfdd73c: DO NOT MERGE. Improve colors of read/unread messages.
Merge commit 'fdfdd73cebd29806e1512f03d6d6ff2a349b10ac' into eclair-plus-aosp

* commit 'fdfdd73cebd29806e1512f03d6d6ff2a349b10ac':
  DO NOT MERGE.  Improve colors of read/unread messages.
2009-12-07 16:13:14 -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
Marc Blank 3421041995 am 3af9f4cb: Merge change I9bec1244 into eclair-mr2
Merge commit '3af9f4cbf325ee8be923e98344e9a441c0284ae7' into eclair-mr2-plus-aosp

* commit '3af9f4cbf325ee8be923e98344e9a441c0284ae7':
  Fix #2300147 (mistakenly reporting connection error)
2009-12-07 10:21:57 -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 541fa47ee3 am afbad523: am b720ed31: revert previously submitted CL 34143.
Merge commit 'afbad5230eedafb4ec4d2fbd6341e86cf0ea9c4e'

* commit 'afbad5230eedafb4ec4d2fbd6341e86cf0ea9c4e':
  revert previously submitted CL 34143.
2009-12-04 09:45:44 -08:00