Commit Graph

3596 Commits

Author SHA1 Message Date
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
Marc Blank
07dc502e26 am d04ef0fd: am 5c5f3a0d: Fix issue w/ race condition leading to log spam
Merge commit 'd04ef0fd19e06d6ee2afb39f571b720a28478936'

* commit 'd04ef0fd19e06d6ee2afb39f571b720a28478936':
  Fix issue w/ race condition leading to log spam
2010-10-07 12:21:37 -07:00
Makoto Onuki
31a2fdbe87 Make "invite" tab visible
Bug 3072235

Change-Id: I5e4f353905b8f980e258635be8a77f278f2a3342
2010-10-07 10:56:21 -07:00
Makoto Onuki
60c6dc4711 Sparse message list item layout for XL
- Tested on N1 as well
- Also fixes bug 2546662 -- show both invitation & attachment icons

Change-Id: Ic2f42370be32a0beb43f9018cefdce86028e8189
2010-10-07 10:17:58 -07:00
Gilles Debunne
7df2f6cd99 am ba95e58a: New downscaled menu assets
Merge commit 'ba95e58afd450b747eba87c614db98cc221ed804' into gingerbread-plus-aosp

* commit 'ba95e58afd450b747eba87c614db98cc221ed804':
  New downscaled menu assets
2010-10-07 07:12:28 -07:00
Makoto Onuki
de936b83ac Fix race condition regarding message reload.
The method to start ReloadMessageTask() when detecting content
changed events is delay-called, so need to make sure the fragment
is still in the valid state.

Bug 3069896

Change-Id: I1991d902e8044b4f8ca3ffd7d3e2e66005f1e960
2010-10-06 17:48:48 -07:00
Makoto Onuki
bb5fd95e75 Merge "Introduce tabs to view message, attachment and invite separately" 2010-10-06 11:55:41 -07:00
Makoto Onuki
542d9bb2e1 Merge "Remove unused method Utility.getIconIds()" 2010-10-06 11:43:39 -07:00
Gilles Debunne
ba95e58afd New downscaled menu assets
Change-Id: I00b816df25bc03b63f0960dbb735d4d55c63328d
2010-10-06 09:57:45 -07:00
Makoto Onuki
f54e08eaee Introduce tabs to view message, attachment and invite separately
Added "tabs" to the message view according to the latset mock.
This removes the necessity of putting a WebView inside a ScrollView,
which caused the infinitely-growing email bug (issue 6882).

Right now the tabs are actually just Buttons.  Complete visual refresh
should follow it.

http://code.google.com/p/android/issues/detail?id=6882
Bug 2349275

Change-Id: I897a3a32e0dd7a90d637ac5ea1d47e5e65a1eabe
2010-10-05 16:53:59 -07:00
Makoto Onuki
feb8869c4f Remove unused method Utility.getIconIds()
And redirected the related tests to getIcon().

Bug 2894555

Change-Id: I1d90f01e7476ca79bddd644e123ad979d6ebe987
2010-10-05 16:15:38 -07:00
Andy Stadler
0da4a3b63c am 79b05696: (-s ours) am d7876681: Reorganize startup/shutdown code in SyncManager DO NOT MERGE
Merge commit '79b05696876aadada8cb3f21f89f36b7ae72121d'

* commit '79b05696876aadada8cb3f21f89f36b7ae72121d':
  Reorganize startup/shutdown code in SyncManager DO NOT MERGE
2010-10-05 15:18:04 -07:00
Marc Blank
d04ef0fd19 am 5c5f3a0d: Fix issue w/ race condition leading to log spam
Merge commit '5c5f3a0dbcef00bc1a20f16f924bab85133e4407' into gingerbread-plus-aosp

* commit '5c5f3a0dbcef00bc1a20f16f924bab85133e4407':
  Fix issue w/ race condition leading to log spam
2010-10-05 14:13:22 -07:00
Marc Blank
5c5f3a0dbc Fix issue w/ race condition leading to log spam
Bug: 3064901
Change-Id: I115fa6878ae9b4464b3f0b9cace1f200e2e5f47c
2010-10-05 12:52:35 -07:00
Makoto Onuki
d058f8abcd Auto-refresh message view
Now MessageViewFragment detects changes made to the current message,
and update the UI.
(Although it doesn't really know if the message is really changed, or just
something else was changed in the DB.  It updates the header regardless.)

Change-Id: I35627c7aff129723b83605fc84521da907078571
2010-10-05 11:11:31 -07:00
Makoto Onuki
591e8fa0c9 Merge "Fix "move to" dialog style" 2010-10-05 11:06:00 -07:00
Makoto Onuki
7bfa32dbc5 Merge "Move reply/forward buttons to header" 2010-10-05 11:05:51 -07:00
Makoto Onuki
01b7e67f78 Move reply/forward buttons to header
Moved the buttons to the header.  All other buttons below the message view
go away, so I just hid the old buttons.

Also now we stop trying to hide these buttons when entering contextual mode,
which fixes bug 3044284: Message view buttons get disabled when closing
quick contact

Assets were temporarily copied from gmail.

Change-Id: Ib178c6221dfab02832a10d0c0441044e4969fb70
2010-10-05 11:04:10 -07:00
Makoto Onuki
573e0c5ffd Merge "Extract the throttling part from ThrottlingCursorLoader" 2010-10-05 10:26:14 -07:00
Andy Stadler
79b0569687 am d7876681: Reorganize startup/shutdown code in SyncManager DO NOT MERGE
Merge commit 'd7876681a85a4cc799feec775bdfe7927f983464' into gingerbread-plus-aosp

* commit 'd7876681a85a4cc799feec775bdfe7927f983464':
  Reorganize startup/shutdown code in SyncManager DO NOT MERGE
2010-10-04 16:20:09 -07:00
Andy Stadler
d7876681a8 Reorganize startup/shutdown code in SyncManager DO NOT MERGE
* Move all thread-related startup code into run()
* Move all thread-related shutdown code into new method shutdown()
* Add appropriate synchronization during startup/shutdown
* Add thread names to worker threads

Bug: 2790929
Bug: 2645835

Backport of: Idbd35892cea3de5fbd365102a62103b2f0bdf6c9
Backport of: Ib12a70222ac3fd9e65bec3834c0aae061858776c

Change-Id: Idfd1c9ac7fbe8ce6859b1933ab6d287e3cb0d2e9
2010-10-04 15:50:41 -07:00
Makoto Onuki
085f7eb121 Extract the throttling part from ThrottlingCursorLoader
Extracted into the Throttle class as I'll need this logic elsewhere.

Bonus: Now it has tests.

Change-Id: Ie9a5933f8e5015dda6985ba76814f1f945266178
2010-10-01 17:46:59 -07:00