Commit Graph

1308 Commits

Author SHA1 Message Date
Android (Google) Code Review
4e424a33c2 Merge change Ie093215f into eclair
* changes:
  Add truncation at 100k (EAS 2.5) and 200k (EAS 12) (#2184807)
2009-10-13 17:39:59 -04:00
Andrew Stadler
b48b1e9a81 am b7c67a01: am 754240bc: Fix race condition in testMultiple()
Merge commit 'b7c67a0124fe4897c71f5cbe4bbae87621a6a1fa' into eclair-mr2-plus-aosp

* commit 'b7c67a0124fe4897c71f5cbe4bbae87621a6a1fa':
  Fix race condition in testMultiple()
2009-10-13 12:47:23 -07:00
Andrew Stadler
b7c67a0124 am 754240bc: Fix race condition in testMultiple()
Merge commit '754240bcf3ccc8492a50ba9ee8056b34f6e4e8d0' into eclair-mr2

* commit '754240bcf3ccc8492a50ba9ee8056b34f6e4e8d0':
  Fix race condition in testMultiple()
2009-10-13 12:43:20 -07:00
Andrew Stadler
c1f1d7279c am 754240bc: Fix race condition in testMultiple()
Merge commit '754240bcf3ccc8492a50ba9ee8056b34f6e4e8d0' into eclair-plus-aosp

* commit '754240bcf3ccc8492a50ba9ee8056b34f6e4e8d0':
  Fix race condition in testMultiple()
2009-10-13 12:43:11 -07:00
Marc Blank
5fd81cad4c Add truncation at 100k (EAS 2.5) and 200k (EAS 12) (#2184807)
* Prevents OOM errors with huge message bodies

Change-Id: Ie093215f96a514b3a1bcd31aa1f5957d1ada7719
2009-10-13 12:06:47 -07:00
Andrew Stadler
754240bcf3 Fix race condition in testMultiple()
* If we close the activity while a requeryList() is pending in the
  handler queue, we'll eventually try to operate on a closed cursor
  when we get to testMultiple().
* The fix: Return immediately if the cursor is not available.

Fixes bug http://b/2180416
Followup for bug http://b/2149083
2009-10-13 12:02:46 -07:00
Mihai Preda
10a1facb8d am 2bc47f24: MessageView: use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET when viewing attachments.
Merge commit '2bc47f24a4db464f58977ae808f754e2a9191daa' into eclair-mr2-plus-aosp

* commit '2bc47f24a4db464f58977ae808f754e2a9191daa':
  MessageView: use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET when viewing attachments.
2009-10-13 04:01:46 -07:00
Mihai Preda
2bc47f24a4 MessageView: use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET when viewing attachments.
Bug 2180995.
2009-10-13 12:53:16 +02:00
Marc Blank
a844e8a69b am 255dba84: am 2c74ee56: Prevent EmailAddressAdapter from leaking cursors; load in bg
Merge commit '255dba84f123ee4645217fd7e07b5bdd0d89aa61' into eclair-mr2-plus-aosp

* commit '255dba84f123ee4645217fd7e07b5bdd0d89aa61':
  Prevent EmailAddressAdapter from leaking cursors; load in bg
2009-10-12 14:07:37 -07:00
Marc Blank
255dba84f1 am 2c74ee56: Prevent EmailAddressAdapter from leaking cursors; load in bg
Merge commit '2c74ee56a44e7a43bda14e88fd2b571fd88952fe' into eclair-mr2

* commit '2c74ee56a44e7a43bda14e88fd2b571fd88952fe':
  Prevent EmailAddressAdapter from leaking cursors; load in bg
2009-10-12 14:02:19 -07:00
Marc Blank
b2304d2778 am 2c74ee56: Prevent EmailAddressAdapter from leaking cursors; load in bg
Merge commit '2c74ee56a44e7a43bda14e88fd2b571fd88952fe' into eclair-plus-aosp

* commit '2c74ee56a44e7a43bda14e88fd2b571fd88952fe':
  Prevent EmailAddressAdapter from leaking cursors; load in bg
2009-10-12 14:01:45 -07:00
Marc Blank
2c74ee56a4 Prevent EmailAddressAdapter from leaking cursors; load in bg
* Relates to a number of bugs related to ANR's and slow behavior
  when addressing mail
* Call changeCursor(null) on the Adapter when the activity is destroyed
* Call getCount() in the background thread to force data there rather
  than in the UI thread
* If this change is accepted, something equivalent should be
  used in the Gmail app as well
* Addresses #2180237 (P1, target Eclair_Sholes) as well as
  #2180976 and #2146926, the latter two of which were fixed
  with workarounds.

Change-Id: I7503c5fbe091dbc5e784d5a7bebeb3d60226d57d
2009-10-12 13:54:05 -07:00
Mihai Preda
8a55972c59 am 89966059: am 1a377f09: MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there\'s no source message, to avoid duplicated email addresses on orientation change.
Merge commit '89966059c997a410c0b54be2d56e1259ed99940f' into eclair-mr2-plus-aosp

* commit '89966059c997a410c0b54be2d56e1259ed99940f':
  MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there's no source message, to avoid duplicated email addresses on orientation change.
2009-10-12 11:47:33 -07:00
Mihai Preda
5e91f73113 am 1a377f09: MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there\'s no source message, to avoid duplicated email addresses on orientation change.
Merge commit '1a377f096f3a263bba536355823290db4bba7434' into eclair-plus-aosp

* commit '1a377f096f3a263bba536355823290db4bba7434':
  MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there's no source message, to avoid duplicated email addresses on orientation change.
2009-10-12 11:42:46 -07:00
Mihai Preda
89966059c9 am 1a377f09: MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there\'s no source message, to avoid duplicated email addresses on orientation change.
Merge commit '1a377f096f3a263bba536355823290db4bba7434' into eclair-mr2

* commit '1a377f096f3a263bba536355823290db4bba7434':
  MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there's no source message, to avoid duplicated email addresses on orientation change.
2009-10-12 11:42:13 -07:00
Andrew Stadler
e90fc94938 am d5e7afa1: Remove obsolete resources & code
Merge commit 'd5e7afa1ebd6ffe29338e69e709d7998e6572137' into eclair-mr2-plus-aosp

* commit 'd5e7afa1ebd6ffe29338e69e709d7998e6572137':
  Remove obsolete resources & code
2009-10-12 10:29:44 -07:00
Marc Blank
42336c27d3 am 8be9b893: am ea878be1: Make sure we hold WakeLock during mail sending (fixes #2180551)
Merge commit '8be9b8937be04cc50e7fd2e79d2d91c99aace1b5' into eclair-mr2-plus-aosp

* commit '8be9b8937be04cc50e7fd2e79d2d91c99aace1b5':
  Make sure we hold WakeLock during mail sending (fixes #2180551)
2009-10-12 10:24:41 -07:00
Marc Blank
82aaf28b63 am 0fd132d2: Merge change I5de51a43 into eclair-mr2
Merge commit '0fd132d26c0846c00419cae124fb7f881331418b' into eclair-mr2-plus-aosp

* commit '0fd132d26c0846c00419cae124fb7f881331418b':
  Allow photo changes to be uploaded to Exchange (fixes #2179082)
2009-10-12 10:23:40 -07:00
Mihai Preda
1a377f096f MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there's no source message, to avoid duplicated email addresses on orientation change.
Bug 2180955.
2009-10-12 13:39:42 +02:00
Andrew Stadler
d5e7afa1eb Remove obsolete resources & code
* FolderMessageList
* Fat title bar (remnants)
* Drawables

Bug # http://b/2071133
2009-10-11 22:09:39 -07:00
Marc Blank
bf7b721709 am ea878be1: Make sure we hold WakeLock during mail sending (fixes #2180551)
Merge commit 'ea878be11729cd793d9183fc264118241cd5a5b6' into eclair-plus-aosp

* commit 'ea878be11729cd793d9183fc264118241cd5a5b6':
  Make sure we hold WakeLock during mail sending (fixes #2180551)
2009-10-10 22:59:54 -07:00
Marc Blank
8be9b8937b am ea878be1: Make sure we hold WakeLock during mail sending (fixes #2180551)
Merge commit 'ea878be11729cd793d9183fc264118241cd5a5b6' into eclair-mr2

* commit 'ea878be11729cd793d9183fc264118241cd5a5b6':
  Make sure we hold WakeLock during mail sending (fixes #2180551)
2009-10-10 22:59:05 -07:00
Marc Blank
ea878be117 Make sure we hold WakeLock during mail sending (fixes #2180551)
* Don't runAsleep unless this is a Ping
* Relates to #2178288 in that it's possible that the system could
  sleep while we're trying to send (not sure if this is possible;
  will check), so we prevent it by holding a WakeLock in this case

Change-Id: Ib3f8786501b942e1cfcb7a0bbb07b8e3084e2a86
2009-10-10 22:54:24 -07:00
Android (Google) Code Review
0fd132d26c Merge change I5de51a43 into eclair-mr2
* changes:
  Allow photo changes to be uploaded to Exchange (fixes #2179082)
2009-10-09 21:57:55 -04:00
Marc Blank
59da135e15 Allow photo changes to be uploaded to Exchange (fixes #2179082)
Change-Id: I5de51a4313c43dbe4e3d12d4d0e11b20adedaa8f
2009-10-09 14:34:53 -07:00
Mike Cleron
36cb41da26 am 4cce00d6: am 479b22a2: Make multiselect buttons update when the list state changes
Merge commit '4cce00d6c4c70bfc43409f677556ef07098d3700' into eclair-mr2-plus-aosp

* commit '4cce00d6c4c70bfc43409f677556ef07098d3700':
2009-10-09 13:33:55 -07:00
Evan Millar
0daaa3625c Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp 2009-10-09 13:33:55 -07:00
Mike Cleron
7cff2989de am 479b22a2: Make multiselect buttons update when the list state changes
Merge commit '479b22a2f8966b63789c89e878b615ebd53708c0' into eclair-plus-aosp

* commit '479b22a2f8966b63789c89e878b615ebd53708c0':
  Make multiselect buttons update when the list state changes
2009-10-09 13:28:32 -07:00
Mike Cleron
4cce00d6c4 am 479b22a2: Make multiselect buttons update when the list state changes
Merge commit '479b22a2f8966b63789c89e878b615ebd53708c0' into eclair-mr2

* commit '479b22a2f8966b63789c89e878b615ebd53708c0':
  Make multiselect buttons update when the list state changes
2009-10-09 13:28:10 -07:00
Mike Cleron
479b22a2f8 Make multiselect buttons update when the list state changes 2009-10-09 13:19:26 -07:00
Marc Blank
ae968df16d am 7a8bbfe0: am 4b59cfc8: Fix problem with timeouts and sending attachments (#2178288)
Merge commit '7a8bbfe0b07a111d8e77fe05165575deed9bb4b6' into eclair-mr2-plus-aosp

* commit '7a8bbfe0b07a111d8e77fe05165575deed9bb4b6':
2009-10-09 12:47:59 -07:00
Mike Cleron
065d5c6292 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp 2009-10-09 12:47:59 -07:00
Marc Blank
2b120cf838 am 4b59cfc8: Fix problem with timeouts and sending attachments (#2178288)
Merge commit '4b59cfc8ed4054ffb5ad85cea8aba94a430cc2cb' into eclair-plus-aosp

* commit '4b59cfc8ed4054ffb5ad85cea8aba94a430cc2cb':
  Fix problem with timeouts and sending attachments (#2178288)
2009-10-09 12:43:14 -07:00
Marc Blank
7a8bbfe0b0 am 4b59cfc8: Fix problem with timeouts and sending attachments (#2178288)
Merge commit '4b59cfc8ed4054ffb5ad85cea8aba94a430cc2cb' into eclair-mr2

* commit '4b59cfc8ed4054ffb5ad85cea8aba94a430cc2cb':
  Fix problem with timeouts and sending attachments (#2178288)
2009-10-09 12:43:01 -07:00
Marc Blank
4b59cfc8ed Fix problem with timeouts and sending attachments (#2178288)
* Standard Exchange command timeouts are 20 seconds
* For sending, however, these need to be significantly longer to
  handle the case of sending large attachments, as sending (of any
  length) happens in a single HTTP Post command
* Having an infinite timeout leads to the (small) possibility of the
  Outbox hanging for a long time, holding up the sending of other
  mail, so we set a long, but not infinite timeout for this case
* Timeout now set for 15 minutes
* Prevent sync of Outbox and Drafts (the UI triggers these by changing
  the contents of these boxes, but we need to ignore the pings that
  are generated this way)

Change-Id: I5b830d6b4e94525d95138b2112be12898a37882e
2009-10-09 11:20:52 -07:00
Mihai Preda
51e7fa5dc4 am affa5660: MessageView: UI change prev/next arrows.
Merge commit 'affa5660e7b4b97d3011d7272bb8c05f45990f26' into eclair-mr2-plus-aosp

* commit 'affa5660e7b4b97d3011d7272bb8c05f45990f26':
  MessageView: UI change prev/next arrows.
2009-10-09 05:24:09 -07:00
Rebecca Schultz Zavin
9e72a844d1 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp 2009-10-09 05:24:09 -07:00
Mihai Preda
affa5660e7 MessageView: UI change prev/next arrows.
Bug: 2149187

The prev/next buttons now each extends half the width, and are on black background.
2009-10-09 14:17:49 +02:00
Eric Fischer
82a7fb7dfb am b634dbf6: am 20b3ba23: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'b634dbf618f03eb19801139fed6c8237db0d01d2' into eclair-plus-aosp

* commit 'b634dbf618f03eb19801139fed6c8237db0d01d2':
  Import revised translations.  DO NOT MERGE
2009-10-08 11:17:59 -07:00
Eric Fischer
38fdd515ee am 268d5faa: am b634dbf6: (-s ours) am 20b3ba23: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '268d5faa1c7494e395bf99c5184a9e9dd98df568' into eclair-mr2-plus-aosp

* commit '268d5faa1c7494e395bf99c5184a9e9dd98df568':
  Import revised translations.  DO NOT MERGE
2009-10-08 11:01:41 -07:00
Eric Fischer
268d5faa1c am b634dbf6: (-s ours) am 20b3ba23: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'b634dbf618f03eb19801139fed6c8237db0d01d2' into eclair-mr2

* commit 'b634dbf618f03eb19801139fed6c8237db0d01d2':
  Import revised translations.  DO NOT MERGE
2009-10-08 10:55:01 -07:00
Eric Fischer
b634dbf618 am 20b3ba23: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '20b3ba2303da8b790afedf84bd20f370bbdf703b' into eclair

* commit '20b3ba2303da8b790afedf84bd20f370bbdf703b':
  Import revised translations.  DO NOT MERGE
2009-10-08 10:43:54 -07:00
Marc Blank
fae9068859 am 676ea183: Merge change I15dccd1f into eclair-mr2
Merge commit '676ea183bdb57c4331add12ced3d4c9ae2629c3a' into eclair-mr2-plus-aosp

* commit '676ea183bdb57c4331add12ced3d4c9ae2629c3a':
  Server validates even though server address is wrong
2009-10-08 08:21:32 -07:00
Marc Blank
f9191a955a am ff0c1f63: Merge change Ic2d782c1 into eclair-mr2
Merge commit 'ff0c1f631348f0cdfa6733b37e2a65202a434923' into eclair-mr2-plus-aosp

* commit 'ff0c1f631348f0cdfa6733b37e2a65202a434923':
  Add checks to prevent duplicate service starts (fixes #2099830)
2009-10-08 08:16:56 -07:00
Android (Google) Code Review
676ea183bd Merge change I15dccd1f into eclair-mr2
* changes:
  Server validates even though server address is wrong
2009-10-08 11:15:46 -04:00
Android (Google) Code Review
ff0c1f6313 Merge change Ic2d782c1 into eclair-mr2
* changes:
  Add checks to prevent duplicate service starts (fixes #2099830)
2009-10-08 11:12:08 -04:00
Mihai Preda
e284eb9e61 am ba0b7340: am 73032f46: Email: exit AsyncTask.onPostExecute() if the result is null or isCancelled().
Merge commit 'ba0b734043186f7eb0c7de01aec44f9b0307c569' into eclair-mr2-plus-aosp

* commit 'ba0b734043186f7eb0c7de01aec44f9b0307c569':
2009-10-08 06:19:18 -07:00
Dima Zavin
d3dfc2b740 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp 2009-10-08 06:19:18 -07:00
Mihai Preda
ce34f47dd0 am 73032f46: Email: exit AsyncTask.onPostExecute() if the result is null or isCancelled().
Merge commit '73032f4657a77f733a348fe3c2c1fa783d335ff0' into eclair-plus-aosp

* commit '73032f4657a77f733a348fe3c2c1fa783d335ff0':
  Email: exit AsyncTask.onPostExecute() if the result is null or isCancelled().
2009-10-08 06:13:59 -07:00
Mihai Preda
ba0b734043 am 73032f46: Email: exit AsyncTask.onPostExecute() if the result is null or isCancelled().
Merge commit '73032f4657a77f733a348fe3c2c1fa783d335ff0' into eclair-mr2

* commit '73032f4657a77f733a348fe3c2c1fa783d335ff0':
  Email: exit AsyncTask.onPostExecute() if the result is null or isCancelled().
2009-10-08 06:13:27 -07:00