Commit Graph

3648 Commits

Author SHA1 Message Date
Marc Blank
023285796b Merge "Add dump of AttachmentDownloadService" 2010-10-25 12:49:36 -07:00
Marc Blank
9f40cbcb3e Merge "Don't upsync empty contact tags" 2010-10-25 12:48:31 -07:00
Marc Blank
da0bdb7cec Don't upsync empty contact tags
* EAS 12.0/12.1 don't mind these, but EAS 2.5 objects in some cases
  (title and prefix, certainly)  and the upsync fails
* The error case occurs because the ContentValues provided by
  ContactsProvider actually has a value; the value, however, is an
  empty string
* Prevent this by checking for empty values before serializing

Bug: 2607778
Change-Id: I853ce711024a414f53861720000cc87a7349d660
2010-10-25 12:46:57 -07:00
Makoto Onuki
728c96d6dc Merge "Enable OpenGL acceleration." 2010-10-25 11:47:44 -07:00
Marc Blank
a162668f23 Add dump of AttachmentDownloadService
* Will be helpful for debugging our new background service

Change-Id: Ia865c7c6cb418bd1a1f3d593421b98664c041e07
2010-10-22 16:57:05 -07:00
Eric Fischer
b84e9607dd am 9182a1c3: (-s ours) am 731a9705: Import revised translations. DO NOT MERGE 2010-10-22 16:08:29 -07:00
Eric Fischer
9182a1c36b am 731a9705: Import revised translations. DO NOT MERGE 2010-10-22 16:06:37 -07:00
Eric Fischer
731a970594 Import revised translations. DO NOT MERGE
Change-Id: I885730c4fd495120c788d11bcd59bbb5fba44743
2010-10-22 15:28:07 -07:00
Jean-Baptiste Queru
9a9c725174 Merge a059c4a1 from gingerbread-plus-aosp
Change-Id: I955120aff44d69bcd6fde165ac7ac974acbd3c78
2010-10-22 05:55:38 -07:00
Marc Blank
a059c4a1c7 am 2a08ef0d: Don\'t allow MailService to schedule EAS accounts
Merge commit '2a08ef0d285ebf9e8fe86afec1ac4732586b7bb5' into gingerbread-plus-aosp

* commit '2a08ef0d285ebf9e8fe86afec1ac4732586b7bb5':
  Don't allow MailService to schedule EAS accounts
2010-10-21 23:13:07 -07:00
Marc Blank
7ace73d7f0 am 1ecc7da0: (-s ours) am 4a546f5f: DO NOT MERGE: Backport AttachmentProvider security fix
Merge commit '1ecc7da07ff085d4c23636d4fdd7eaaf0640d026'

* commit '1ecc7da07ff085d4c23636d4fdd7eaaf0640d026':
  DO NOT MERGE: Backport AttachmentProvider security fix
2010-10-21 17:23:45 -07:00
Marc Blank
1ecc7da07f am 4a546f5f: DO NOT MERGE: Backport AttachmentProvider security fix
Merge commit '4a546f5f6e22747304a07ab6892aa318447b5fe7' into gingerbread-plus-aosp

* commit '4a546f5f6e22747304a07ab6892aa318447b5fe7':
  DO NOT MERGE: Backport AttachmentProvider security fix
2010-10-21 17:07:28 -07:00
Marc Blank
2a08ef0d28 Don't allow MailService to schedule EAS accounts
Bug: 3120208
Change-Id: I53e935f8bf08e0bda6e2cd483229a6377ed39d74
2010-10-21 16:49:41 -07:00
Marc Blank
4a546f5f6e DO NOT MERGE: Backport AttachmentProvider security fix
* Apps trying to open attachments using AttachmentProvider were
  seeing SecurityExceptions due to the fact that internal calls
  from AttachmentProvider to EmailProvider didn't have their
  calling identity saved/restored.
* Updated provider calls so that these calls use the Email
  process' identity.
* Backport of Ifb71ad834530c6232728e1aad31439991f8ed379, fixing
  2908737

Bug: 3121146
Change-Id: Ifa3a0ca8d3e34733c937d7f8c60f068984e1f4f2
2010-10-21 15:39:36 -07:00
Makoto Onuki
8c3629c978 Merge "Skip testCommaInserting if screen is off or locked." 2010-10-21 13:54:34 -07:00
Makoto Onuki
e9919377ee Skip testCommaInserting if screen is off or locked.
sendKey() doesn't work if the screen is off or locked.

We could probably use a WakeLock and KeyguardLock to force the
screen to be on, but that'd require adding unnecessary permissions
to the email app. (not the test apk)

Bug 1737038

Change-Id: Ic036dc4d12770e82bc5de1133d6dd34cd8465f30
2010-10-21 13:51:46 -07:00
Marc Blank
ca065c3927 Merge "Respect the RESPONSE_REQUESTED tag in meeting invite mail" 2010-10-21 08:14:44 -07:00
Makoto Onuki
a44c0349fa Merge "Don't move drafts to trash" 2010-10-20 17:37:42 -07:00
Makoto Onuki
6a2265eff2 Add checkbox to include original text or not.
Added the "Include text" checkbox according to the latest mock.

Before:
- We removed original message when the user pressed X.

Now:
- We save the original message all the way till the draft is sent.
- The "Include text" check state is saved in the db.  (to Message.mFlags)

Bug 3072414

Change-Id: Ie7bcca23bb6a02d676700027b0b6cb94b6627236
2010-10-20 14:21:17 -07:00
Marc Blank
8d70372e0a Merge "Don't duplicate attachments when saving drafts" 2010-10-20 13:20:40 -07:00
Marc Blank
e14aa7dacb Merge "Add account name to temporary sync error UI to help debugging" 2010-10-20 13:05:05 -07:00
Marc Blank
3bdba62f58 Don't duplicate attachments when saving drafts
Bug: 3070196
Change-Id: Ic9dffe57cdc81615e07b1c593fc71085e1281718
2010-10-20 13:03:33 -07:00
Makoto Onuki
33c86101f7 Enable OpenGL acceleration.
Looks like it no longer has obvious bugs.

Change-Id: I48876c62c4ebd5a32bcca8fb7a230c428b4b35f7
2010-10-20 12:31:07 -07:00
Marc Blank
deb51f824e Add account name to temporary sync error UI to help debugging
* At this point, there are a lot of toasts shown that relate to
  sync failures (e.g. "Unable to connect to server").  To help
  find where they're coming from, add the display name of the
  account
* UX folks: Please consider what this UI should be

Change-Id: Id9b76cd22178727bedaf67ad0b7450edff99a791
2010-10-19 15:45:03 -07:00
Marc Blank
a8bb34fd62 Respect the RESPONSE_REQUESTED tag in meeting invite mail
Bug: 2639037
Change-Id: I4bd73f23ba270fa0ead72971b5a79d9db678a8dd
2010-10-19 14:23:54 -07:00
Makoto Onuki
77aabd9519 Don't move drafts to trash
Now deleted drafts are really deleted, rather than getting moved to trash.

Also rewrote the test to avoid creating AsyncTasks on the test thread.
In this case it seems to be running fine, but I've had problems doing this
before.

Bug 3099179

Change-Id: Ice5298bf94312ce764d90aa35c5a6c5262ec5b42
2010-10-19 13:54:05 -07:00
Marc Blank
eb49659423 Prevent MailService from spamming AccountManager during reconcile
* When any Account is modified, MailService gets a content notification and
  runs reconciliation in an AsyncTask.  Reconciliation ends up calling the
  AccountManager, which also runs asynchronously.  The net effect is that,
  especially during unit tests, where we create/destroy accounts rapidly,
  these calls can "back up", ending in a situation in which the worker pool
  for AsyncTask is filled, with a resulting RejectedExecutionException
* We fix this by preventing more than one request for reconciliation to
  be queued at a time
* Added a unit test that thrashes the notification handler

Bug: 2937628
Change-Id: Iaf25806efb46831f31704604360df091752d9525
2010-10-18 14:07:47 -07:00
Marc Blank
07a91c1655 Merge "Fix errors in MockProvider unit tests" 2010-10-18 14:04:10 -07:00
Marc Blank
6af171cae6 Fix errors in MockProvider unit tests
Change-Id: Ibfe6d72547f182332fddf82a842a131f920f5e7f
2010-10-16 21:12:12 -07:00
Kenny Root
6997b65710 am 905fec26: (-s ours) am dd479065: Import revised translations
Merge commit '905fec26373b615c479d784e91a6aa35c9faff8c'

* commit '905fec26373b615c479d784e91a6aa35c9faff8c':
  Import revised translations
2010-10-15 14:08:57 -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
Kenny Root
905fec2637 am dd479065: Import revised translations
Merge commit 'dd4790651b32f7de741e101341c439f1434a2082' into gingerbread-plus-aosp

* commit 'dd4790651b32f7de741e101341c439f1434a2082':
  Import revised translations
2010-10-14 12:01:03 -07:00
Makoto Onuki
a5fcefd179 Merge "Fix potential crash in MessageViewFragment.openMessageSync" 2010-10-14 10:55:45 -07:00
Kenny Root
dd4790651b Import revised translations
Change-Id: I30d0ddf21979a6ae1c75ee5e601a9a448079b5de
2010-10-14 09:43:56 -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