Commit Graph

3617 Commits

Author SHA1 Message Date
Marc Blank
6af171cae6 Fix errors in MockProvider unit tests
Change-Id: Ibfe6d72547f182332fddf82a842a131f920f5e7f
2010-10-16 21:12:12 -07:00
Andy Stadler
f8b30b776b am 1e64175c: (-s ours) am 214c6c6c: Fix remote wipe with mobile sync server
Merge commit '1e64175c7a80667f55dfa49f8651a73243f03a65'

* commit '1e64175c7a80667f55dfa49f8651a73243f03a65':
  Fix remote wipe with mobile sync server
2010-10-15 09:44:59 -07:00
Andy Stadler
6fa2d73b97 am 73c1645b: (-s ours) am efcde27b: Use original all-day flag when upsyncing exceptions DO NOT MERGE
Merge commit '73c1645b9052dd52eeca0b4bcf4438e50d0555f9'

* commit '73c1645b9052dd52eeca0b4bcf4438e50d0555f9':
  Use original all-day flag when upsyncing exceptions DO NOT MERGE
2010-10-15 08:32:48 -07:00
Andy Stadler
75d9fc337a am 25cc1ec4: (-s ours) am 9c2baaab: Fix upsync of exceptions in EAS 2.5 (Exchange 2003) DO NOT MERGE
Merge commit '25cc1ec4de9bfcee0e5b02fa2004435ac0090f93'

* commit '25cc1ec4de9bfcee0e5b02fa2004435ac0090f93':
  Fix upsync of exceptions in EAS 2.5 (Exchange 2003)  DO NOT MERGE
2010-10-15 08:32:46 -07:00
Andy Stadler
07d047638f am 0f8cd216: (-s ours) am 419a36ca: Give email its own version# scheme. DO NOT MERGE
Merge commit '0f8cd216977887541c977ebffa67925b1f3652ee'

* commit '0f8cd216977887541c977ebffa67925b1f3652ee':
  Give email its own version# scheme.  DO NOT MERGE
2010-10-15 08:31:48 -07:00
Makoto Onuki
7fdd88e37c Merge "Put the dest mailbox name in the "message moved" toast" 2010-10-14 15:36:37 -07:00
Makoto Onuki
ee7205d100 Put the dest mailbox name in the "message moved" toast
Also removed obsolete todo

Bug 3075984

Change-Id: I10ce9df29c4913c328d2a962151d4a9f2e6e1408
2010-10-14 15:14:46 -07:00
Makoto Onuki
b0ffb3e39a Merge "Don't use negative IDs with ListView" 2010-10-14 14:45:23 -07:00
Makoto Onuki
9b5001a34c Don't use negative IDs with ListView
ListView uses the _id column for some operations, including
onSave/RestoreInstanceState, and if the column contains negative values
they don't work as expected.  The same assumption seems to be in other places
as well, so let's just avoid using negative IDs.

With this CL we now use two different IDs, one for ListView, which will
never be negative, and the other for us, the actual mailbox ID.

Bug 3049315

Change-Id: I263b4895212b5f8bb80c98acaf5c4eccd0bfef55
2010-10-14 14:42:46 -07:00
Makoto Onuki
a5fcefd179 Merge "Fix potential crash in MessageViewFragment.openMessageSync" 2010-10-14 10:55:45 -07:00
Andy Stadler
1e64175c7a am 214c6c6c: Fix remote wipe with mobile sync server
Merge commit '214c6c6c8173cf90a3e45615a6896a48dc643e68' into gingerbread-plus-aosp

* commit '214c6c6c8173cf90a3e45615a6896a48dc643e68':
  Fix remote wipe with mobile sync server
2010-10-13 16:46:41 -07:00
Andy Stadler
214c6c6c81 Fix remote wipe with mobile sync server
* It appears as if our running multiple sync threads can confuse the
  mobile sync server during a remote wipe (the server expects the next
  client response to be an acknowledgment, whereas it might well be
  a command or response from a different thread)
* To avoid this, we first put the account on security hold and then
  shut down all other sync threads for the account
* After this, we send the acknowledgment and the remote wipe proceeds
  normally.
* NOTE: It's possible that, due to the vagaries of multithreaded
  operation, one of the other syncing threads could still send a non-
  acknowledgment response to the server before our provisioning thread
  gets a chance to send its acknowledgment.  However, since the other
  syncing threads will terminate (and not restart, because of the hold),
  the provision/remote wipe/ack sequence will work on the subsequent
  attempt

Bug: 2844888
Backport From: Ib4ffbbc67b681e69176b6c1d5515fa80c7d1e121

Change-Id: Ie9e944bd39f331c2ddc0f0ba303a3d5684f6f033
2010-10-13 15:39:27 -07:00
Andy Stadler
73c1645b90 am efcde27b: Use original all-day flag when upsyncing exceptions DO NOT MERGE
Merge commit 'efcde27bf74acdd82bb0aad0ad1fd0b767ca5f18' into gingerbread-plus-aosp

* commit 'efcde27bf74acdd82bb0aad0ad1fd0b767ca5f18':
  Use original all-day flag when upsyncing exceptions DO NOT MERGE
2010-10-13 15:09:36 -07:00
Andy Stadler
25cc1ec4de am 9c2baaab: Fix upsync of exceptions in EAS 2.5 (Exchange 2003) DO NOT MERGE
Merge commit '9c2baaabd2feff633db3ed1b782282667e541927' into gingerbread-plus-aosp

* commit '9c2baaabd2feff633db3ed1b782282667e541927':
  Fix upsync of exceptions in EAS 2.5 (Exchange 2003)  DO NOT MERGE
2010-10-13 15:07:48 -07:00
Andy Stadler
efcde27bf7 Use original all-day flag when upsyncing exceptions DO NOT MERGE
Bug: 3087410
Backport of: I4bed0039758e98d4b85054876f192605eb00ee82

Change-Id: Ibc875d58c2f6c5317ce8e4fee97b96c2fd6b2ecf
2010-10-13 15:05:38 -07:00
Andy Stadler
9c2baaabd2 Fix upsync of exceptions in EAS 2.5 (Exchange 2003) DO NOT MERGE
* Apparently, Exchange 2003 doesn't like to see Visibility set in
  Exceptions
* Apparently, Exchange 2003 likes to see Exception Deleted and
  ExceptionStartTime prior to other data
* The word "apparently" is used above to indicate that these
  findings are not part of any specification, but have been
  determined empirically

Bug: 2775885
Backport of: I163f156675f65c494a59d5233b2b6e23b3f1d6a0

Change-Id: I5d32dea5c3903147725b8df87a71e961a4d78c60
2010-10-13 15:02:38 -07:00
Andy Stadler
0f8cd21697 am 419a36ca: Give email its own version# scheme. DO NOT MERGE
Merge commit '419a36ca6e8d0c46875e82c1e8be245b45adbb52' into gingerbread-plus-aosp

* commit '419a36ca6e8d0c46875e82c1e8be245b45adbb52':
  Give email its own version# scheme.  DO NOT MERGE
2010-10-13 14:22:44 -07:00
Marc Blank
9ce8f4d2a3 Use original all-day flag when upsyncing exceptions
Bug: 3087410
Change-Id: I4bed0039758e98d4b85054876f192605eb00ee82
2010-10-13 14:10:36 -07:00
Andy Stadler
419a36ca6e Give email its own version# scheme. DO NOT MERGE
Change-Id: I258ffcf47d243417edadad44714f74247c78b366
2010-10-12 16:39:58 -07:00
Makoto Onuki
09eb977c06 Fix potential crash in MessageViewFragment.openMessageSync
The problem is that ths method is called in a worker thread, so
there's nothing to prevent it from running just after/at the same
time as clearContent() (which sets -1 to mMessageIdToOpen).
If it does, it passes -1 to restoreMessageWithId() and crashes.

Also removed a half-obsolete comment which is a bit too obvious for its length.

Bug 3077387

Change-Id: I736d696046e6d8964a16c80515544c582aca3943
2010-10-12 16:38:40 -07:00
Makoto Onuki
9c293eb65a Show "No messages" when there's no items on message list
Show this when there's no messages, and no "Load more messages" footer.
i.e. Only Outbox, Drafts, and exchange mailboxes can show "No messages".

Also removed an obsolete comment.

Bug 2363624

Change-Id: If483d33cfacb186d0fe54b4f4382333a332be84c
2010-10-12 10:36:17 -07:00
Marc Blank
92f30bedf2 Merge "Fix remote wipe with mobile sync server" 2010-10-11 11:15:12 -07:00
Roy West
0be3fbe11b am 416fdc22: am 0639c6bd: Fix bug 3074186 limit check label to Inbox
Merge commit '416fdc22cadaed61377bf52d80b6052a81497ebf'

* commit '416fdc22cadaed61377bf52d80b6052a81497ebf':
  Fix bug 3074186 limit check label to Inbox
2010-10-11 10:03:34 -07:00
Marc Blank
3afa93c054 Fix remote wipe with mobile sync server
* It appears as if our running multiple sync threads can confuse the
  mobile sync server during a remote wipe (the server expects the next
  client response to be an acknowledgment, whereas it might well be
  a command or response from a different thread)
* To avoid this, we first put the account on security hold and then
  shut down all other sync threads for the account
* After this, we send the acknowledgment and the remote wipe proceeds
  normally.
* NOTE: It's possible that, due to the vagaries of multithreaded
  operation, one of the other syncing threads could still send a non-
  acknowledgment response to the server before our provisioning thread
  gets a chance to send its acknowledgment.  However, since the other
  syncing threads will terminate (and not restart, because of the hold),
  the provision/remote wipe/ack sequence will work on the subsequent
  attempt

Bug: 2844888
Change-Id: Ib4ffbbc67b681e69176b6c1d5515fa80c7d1e121
2010-10-10 16:40:12 -07:00
Daisuke Miyakawa
43f2321d10 Modify code style.
Change-Id: I40eeb738ca2dcc7f21ddbc603b03debde5ac27d3
2010-10-10 15:17:52 -07:00
Daisuke Miyakawa
c8af3175df Merge "Use AccountAuthenticatorResponse properly." 2010-10-10 15:12:48 -07:00
Marc Blank
4f573d26b2 Merge "Fix CalendarSyncAdapterTests" 2010-10-09 16:40:07 -07:00
Marc Blank
5ae9a1b059 Merge "Fix upsync of exceptions in EAS 2.5 (Exchange 2003)" 2010-10-09 16:38:55 -07:00
Roy West
416fdc22ca am 0639c6bd: Fix bug 3074186 limit check label to Inbox
Merge commit '0639c6bd4ed4807bd8cefcca038f81d858aba8af' into gingerbread-plus-aosp

* commit '0639c6bd4ed4807bd8cefcca038f81d858aba8af':
  Fix bug 3074186 limit check label to Inbox
2010-10-09 09:30:28 -07:00
Roy West
0639c6bd4e Fix bug 3074186 limit check label to Inbox
Change-Id: Iec416a2112c98483372694e09f2375c9cf36ac09
2010-10-09 08:53:34 -07:00
Gilles Debunne
c6ce65ed86 am 7df2f6cd: am ba95e58a: New downscaled menu assets
Merge commit '7df2f6cd996faa8568a819eef3e1b6ae6eb60ece'

* commit '7df2f6cd996faa8568a819eef3e1b6ae6eb60ece':
  New downscaled menu assets
2010-10-08 18:28:50 -07:00
Marc Blank
fde172f576 Fix CalendarSyncAdapterTests
Bug: 3077174
Change-Id: Ic0ba851969e852488a72241c8fba9f466c5bc3a6
2010-10-08 17:17:04 -07:00
Marc Blank
a0692b16e1 Fix upsync of exceptions in EAS 2.5 (Exchange 2003)
* Apparently, Exchange 2003 doesn't like to see Visibility set in
  Exceptions
* Apparently, Exchange 2003 likes to see Exception Deleted and
  ExceptionStartTime prior to other data
* The word "apparently" is used above to indicate that these
  findings are not part of any specification, but have been
  determined empirically

Bug: 2775885
Change-Id: I163f156675f65c494a59d5233b2b6e23b3f1d6a0
2010-10-08 16:32:20 -07:00
Marc Blank
30c99e0dc3 Merge "Make sure updatePolicies is always called during provisioning" 2010-10-08 16:27:21 -07:00
Daisuke Miyakawa
9dac94975f Use AccountAuthenticatorResponse properly.
Current implementation ignores callbacks coming from
AccountManager, which should be called everytime
when this Activity finishes its job.

Bug: 3069222
Change-Id: Iea03cf94bdfe8da184e415bf7e759ddeb46ecdd9
2010-10-08 16:16:43 -07:00
Makoto Onuki
6993130a7c Auto-refresh mailbox list
Refresh mailbox list when changing the account, if it's been more than
5 minutes since the last refresh.

Change-Id: I5b1400bb881197e117b8863f850c368c2d1ccbc6
2010-10-08 15:29:38 -07:00
Makoto Onuki
02a750dd64 Fix tests
Bug 3077014
Bug 2992255

Change-Id: I1e8127327158b0821177d0744a60132f89dccdd8
2010-10-08 14:53:40 -07:00
Makoto Onuki
eea35aaab1 Merge "Fix when to clear notification" 2010-10-08 13:51:58 -07:00
Makoto Onuki
241f18f237 Fix when to clear notification
I was assuming MailService.resetNewMessageCount cleared notification,
but it didn't.

Doing it in Activity.onResume is clearly wrong because we don't always
have an account ID there.  If we don't, we're passing -1, which clears
all notifications for all accounts.

We're now calling resetNewMessageCount() in MessageListFragment,
when we refresh the list, so we can remove it from onResume() for the Phone
UI as well.

Bug 3074056

Change-Id: Ib0bb2fbb0309a0784fb3a525927102f423e930df
2010-10-08 13:51:23 -07:00
Makoto Onuki
3ec35f04b9 Merge "Make "invite" tab visible" 2010-10-08 13:49:16 -07:00
Marc Blank
0215d739d5 Make sure updatePolicies is always called during provisioning
Bug: 3055269
Change-Id: Ia266de108847923c01b5e0838a249aa9ee8f2d85
2010-10-08 12:56:14 -07:00
Marc Blank
f8630bfb82 Merge "Fix issue w/ duplicated messages after move (to trash/folder)" 2010-10-07 17:12:50 -07:00
Marc Blank
4d274034bb Merge "Add CHAR LIMIT as appropriate for newish strings" 2010-10-07 17:11:15 -07:00
Marc Blank
5151ca5341 Merge "Handle "Sync Email" properly from AccountSettingsFragment" 2010-10-07 16:05:26 -07:00
Marc Blank
47087049f0 Fix issue w/ duplicated messages after move (to trash/folder)
Bug: 2994014
Change-Id: Ia223447f799ebd6490da2dc5caf1d1270b446a44
2010-10-07 16:04:17 -07:00
Marc Blank
055e8358ed Add CHAR LIMIT as appropriate for newish strings
Bug: 2938090
Change-Id: I905c493f1214645da19e3f16d2781f106df09d04
2010-10-07 15:48:04 -07:00
Makoto Onuki
4b0d4f9f4d Fix "+ -1 more" in notification.
Need to reset lastUnseenMessageCount with unseenMessageCount.

Bug 3069406

Change-Id: I867dfaeb2d39cfd3511f956d60d2187031291780
2010-10-07 15:14:40 -07:00
Marc Blank
cae8626fb9 Handle "Sync Email" properly from AccountSettingsFragment
Bug: 3055326
Change-Id: I7ecc7eda975f0ec03d3d81ed042842eab2c94d4e
2010-10-07 15:04:20 -07:00
Marc Blank
998e3f5eca Merge "Fix MailService unit test" 2010-10-07 14:35:15 -07:00
Marc Blank
fe6e3eae2a Fix MailService unit test
Bug: 2844726
Change-Id: I168b3db49bf422b33d05f25cfff1c7be15150c2b
2010-10-07 14:34:50 -07:00