Commit Graph

1905 Commits

Author SHA1 Message Date
Makoto Onuki
ec82f9d7c0 email unbundling: get rid of the write access to the CursorAdapter.mDataValid.
MessageListAdapter.doRequery() is supporsed to do the same thing as CursorAdapter.onContentChanged() does.  So the entire method body can be replaced with super.onContentChanged().
2009-12-21 15:30:42 -08:00
Marc Blank
f6bc2d95b2 am 4b31f3c7: (-s ours) am 27051e48: Merge change Ife6689fa into eclair
Merge commit '4b31f3c7a6caf0967beef208c172c899c8b6fac1'

* commit '4b31f3c7a6caf0967beef208c172c899c8b6fac1':
  Use correct EAS version in Outbox (fixes #2319892) DO NOT MERGE
2009-12-21 11:51:50 -08:00
Marc Blank
f9b1491a28 am 420f6648: (-s ours) am bfc5de35: Merge change I06d98e54 into eclair
Merge commit '420f664891b2f46356bfc5cdd645aae727ecc71f'

* commit '420f664891b2f46356bfc5cdd645aae727ecc71f':
  Fix delay sending mail after tapping "Send outgoing mail" DO NOT MERGE
2009-12-21 11:51:46 -08:00
Marc Blank
f0b258a745 am c76a22b0: (-s ours) am c874824c: Merge change Iad377728 into eclair
Merge commit 'c76a22b01a2cb78fe75cc591066441fbcf3d90ac'

* commit 'c76a22b01a2cb78fe75cc591066441fbcf3d90ac':
  Don't delete referenced messages from the Exchange server DO NOT MERGE
2009-12-21 11:51:42 -08:00
Marc Blank
4b31f3c7a6 am 27051e48: Merge change Ife6689fa into eclair
Merge commit '27051e480f9cc5396aacc3cc5e520d5875390548' into eclair-plus-aosp

* commit '27051e480f9cc5396aacc3cc5e520d5875390548':
  Use correct EAS version in Outbox (fixes #2319892) DO NOT MERGE
2009-12-21 11:48:22 -08:00
Marc Blank
420f664891 am bfc5de35: Merge change I06d98e54 into eclair
Merge commit 'bfc5de35fa08b6e747e5d5afe72bffafca08ce2a' into eclair-plus-aosp

* commit 'bfc5de35fa08b6e747e5d5afe72bffafca08ce2a':
  Fix delay sending mail after tapping "Send outgoing mail" DO NOT MERGE
2009-12-21 11:48:18 -08:00
Marc Blank
c76a22b01a am c874824c: Merge change Iad377728 into eclair
Merge commit 'c874824ca8b76f795575538ffa34138e2de47cad' into eclair-plus-aosp

* commit 'c874824ca8b76f795575538ffa34138e2de47cad':
  Don't delete referenced messages from the Exchange server DO NOT MERGE
2009-12-21 11:48:14 -08:00
Android (Google) Code Review
27051e480f Merge change Ife6689fa into eclair
* changes:
  Use correct EAS version in Outbox (fixes #2319892) DO NOT MERGE
2009-12-21 11:42:09 -08:00
Android (Google) Code Review
bfc5de35fa Merge change I06d98e54 into eclair
* changes:
  Fix delay sending mail after tapping "Send outgoing mail" DO NOT MERGE
2009-12-21 11:41:24 -08:00
Android (Google) Code Review
c874824ca8 Merge change Iad377728 into eclair
* changes:
  Don't delete referenced messages from the Exchange server DO NOT MERGE
2009-12-21 11:40:43 -08:00
Marc Blank
320a065b6b am 719610ab: am 42e5dca4: Add sanity checks in SyncManager and EasSyncService
Merge commit '719610ab8faee6a0c0ed4ff748cd1eeec3459fa6'

* commit '719610ab8faee6a0c0ed4ff748cd1eeec3459fa6':
  Add sanity checks in SyncManager and EasSyncService
2009-12-18 16:50:58 -08:00
Marc Blank
719610ab8f am 42e5dca4: Add sanity checks in SyncManager and EasSyncService
Merge commit '42e5dca4efb6a5932f2062e9f97af914a3e84aa1' into eclair-mr2-plus-aosp

* commit '42e5dca4efb6a5932f2062e9f97af914a3e84aa1':
  Add sanity checks in SyncManager and EasSyncService
2009-12-18 16:47:18 -08:00
Makoto Onuki
03e9e2d886 Fix typo 2009-12-18 16:36:44 -08:00
Marc Blank
42e5dca4ef Add sanity checks in SyncManager and EasSyncService
* Prevent possible NPE's

Change-Id: I2b3c747609c6a87ec6060fd59006f2912dfcc591
2009-12-18 13:54:53 -08:00
Makoto Onuki
425fd30a9c Email unbundling: Use accessor for CursorAdapter.mCursor and ListActivity.getListView().
Also added a todo for ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS.
2009-12-18 13:26:04 -08:00
Android (Google) Code Review
99bfd7e9b7 Merge change Ibf071fa6
* changes:
  Unbundling email: Make Base64 hidden API free.
2009-12-17 10:25:05 -08:00
Android (Google) Code Review
5e09b8b543 Merge change I4e398aef
* changes:
  Unbundling email: Stub out apache logging.  (See b/2226160)
2009-12-17 10:25:03 -08:00
Makoto Onuki
bf071fa625 Unbundling email: Make Base64 hidden API free.
Seems like it's the simplest way to make it.
- Base64 no longer implements BinaryEncoder/Decoder.  Email app doesn't use them.
- Copied Decoder/EncoderException.  Email app doesn't catch them either.
2009-12-16 16:59:00 -08:00
Makoto Onuki
22a4e0ddbf Unbundling email: Stub out apache logging. (See b/2226160)
Let me know if you don't like the package name.
2009-12-16 16:44:10 -08:00
Andrew Stadler
7d8d18cd6d am 1889528e: am 68011bdd: Revised strings in corporate mail settings screen.
Merge commit '1889528e72f0d001c43f3aaea5dc2716326a4bfd'

* commit '1889528e72f0d001c43f3aaea5dc2716326a4bfd':
  Revised strings in corporate mail settings screen.
2009-12-16 16:38:10 -08:00
Andrew Stadler
1889528e72 am 68011bdd: Revised strings in corporate mail settings screen.
Merge commit '68011bddf01d6b62d621784fad9a43884ec434fd' into eclair-plus-aosp

* commit '68011bddf01d6b62d621784fad9a43884ec434fd':
  Revised strings in corporate mail settings screen.
2009-12-16 16:35:28 -08:00
Andrew Stadler
68011bddf0 Revised strings in corporate mail settings screen.
Bug: 2324042
2009-12-16 14:02:28 -08:00
Marc Blank
608ca667b2 Don't delete referenced messages from the Exchange server DO NOT MERGE
* 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: Iad3777282385bea82276f363d6f95ba8b07cc01c
2009-12-16 12:01:08 -08:00
Marc Blank
23a1cfc8a8 Fix delay sending mail after tapping "Send outgoing mail" DO NOT MERGE
* 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: I06d98e54049b01c2156b1bc3ebbccf043e7b93f5
2009-12-16 11:57:58 -08:00
Marc Blank
21d077e60b Use correct EAS version in Outbox (fixes #2319892) DO NOT MERGE
* 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: Ife6689fa9934da42d98a48df74fca90ba6d1718c
2009-12-16 11:54:46 -08:00
satok
25e00f9660 am 4da26f28: am ec3daeed: Merge change I783790b6 into eclair-mr2
Merge commit '4da26f28593f2711063390079327f2400486e452'

* commit '4da26f28593f2711063390079327f2400486e452':
  Check null pointer in MessageList
2009-12-16 09:00:09 -08:00
satok
4da26f2859 am ec3daeed: Merge change I783790b6 into eclair-mr2
Merge commit 'ec3daeedb3ba65230a49d91b2ca6a3032fb3bd76' into eclair-mr2-plus-aosp

* commit 'ec3daeedb3ba65230a49d91b2ca6a3032fb3bd76':
  Check null pointer in MessageList
2009-12-16 00:05:34 -08:00
Android (Google) Code Review
ec3daeedb3 Merge change I783790b6 into eclair-mr2
* changes:
  Check null pointer in MessageList
2009-12-16 00:03:03 -08:00
satok
9151d86e68 Check null pointer in MessageList
BUG: 2299971
2009-12-16 16:26:20 +09:00
Android Git Automerger
dbc9cbbf8e Merge commit 'goog/eclair-plus-aosp' 2009-12-15 00:45:01 -08:00
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