Commit Graph

1238 Commits

Author SHA1 Message Date
Marc Blank
55a97fc360 Fix attachment loading with "accept certificates" checked
* Fixes #2191778 (P1/S1)
* Attachment retrieval wasn't using newer code to create its
  HttpClient.
* Fix is simple, extremely safe

Change-Id: I65be27decae8719bbad8ac7dce1c1164de4371a5
2009-10-19 10:34:10 -07:00
Andrew Stadler
21d9337a13 am 53123c2f: DO NOT MERGE. Prevent duplication of POP3 attachments
Merge commit '53123c2f914db357fa5b4a8451b23c6be77314a5' into eclair-plus-aosp

* commit '53123c2f914db357fa5b4a8451b23c6be77314a5':
  DO NOT MERGE. Prevent duplication of POP3 attachments
2009-10-14 15:50:15 -07:00
Andrew Stadler
53123c2f91 DO NOT MERGE. Prevent duplication of POP3 attachments
* For each attachment we add, check the DB for an existing attachment
  with similar metadata (name, mime type, content id, etc.)
* Skip adding them if already held
* Unit tests

Originally fixed in 5b0a12c199 / CL I036f39c6

Fixes bug http://b/2084704
2009-10-14 12:41:05 -07:00
Andrew Stadler
185b795d40 am dee4e253: Do not trust server-provided content type for attachments
Merge commit 'dee4e25320c5154a5626446e1aa37f63ae97c48c' into eclair-plus-aosp

* commit 'dee4e25320c5154a5626446e1aa37f63ae97c48c':
  Do not trust server-provided content type for attachments
2009-10-13 21:19:28 -07:00
Andrew Stadler
dee4e25320 Do not trust server-provided content type for attachments
* Fixes a bug that caused some attachments to be labeled with the
  wrong content type and thus unable to be opened by local apps.
* When the attachment code was written, MimeTypeMap had very few
  entries, so we tried to get the mime type of Exchange attachments
  from the stream when the file was read off the server.  It turns
  out that the server's idea of mime type is unpredictable
* In the meantime, MimeTypeMap has been fleshed out, so we really
  do know the type in the vast majority of cases (and including all
  common document types)
* The fix is to remove the lines related to reading the mime
  type from the attachment stream
* Content type is set (properly) when attachment record is created.  See
  EasEmailSyncParser.getMimeTypeFromFileName() for details.

Fixes bug http://b/2182955

Change-Id: Iebb3de529df4548327d7112e1dedb3bd448462a4
2009-10-13 21:09:40 -07:00
Marc Blank
e35f854582 am 4e424a33: Merge change Ie093215f into eclair
Merge commit '4e424a33c29446d750790e360e43fb7c83ec0c6f' into eclair-plus-aosp

* commit '4e424a33c29446d750790e360e43fb7c83ec0c6f':
  Add truncation at 100k (EAS 2.5) and 200k (EAS 12) (#2184807)
2009-10-13 14:45:29 -07:00
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
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
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
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
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
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
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
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
479b22a2f8 Make multiselect buttons update when the list state changes 2009-10-09 13:19:26 -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
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
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
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
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
73032f4657 Email: exit AsyncTask.onPostExecute() if the result is null or isCancelled().
Bug: 2167479
2009-10-08 11:58:45 +02:00
Andrew Stadler
9e22c8b13e am dfee3ff2: Fix a crash when you scroll MessageList to junk @ bottom
Merge commit 'dfee3ff278c4f5d9f7b8273c0e6ecab42585213e' into eclair-plus-aosp

* commit 'dfee3ff278c4f5d9f7b8273c0e6ecab42585213e':
  Fix a crash when you scroll MessageList to junk @ bottom
2009-10-07 16:52:30 -07:00
Andrew Stadler
dfee3ff278 Fix a crash when you scroll MessageList to junk @ bottom
* Add missing reference to spam/junk folder icon
* Unit tests for Utility.FolderProperties.getIconIds()

Fixes http://b/issue?id=2173907
2009-10-07 16:30:41 -07:00
Andrew Stadler
17ab173377 am 5b26bbe4: Switch QuickContact presentation from MEDIUM to LARGE.
Merge commit '5b26bbe4551ca095697f07eca7d09b24573cba11' into eclair-plus-aosp

* commit '5b26bbe4551ca095697f07eca7d09b24573cba11':
  Switch QuickContact presentation from MEDIUM to LARGE.
2009-10-07 16:04:32 -07:00
Andrew Stadler
5b26bbe455 Switch QuickContact presentation from MEDIUM to LARGE.
Bug # http://b/issue?id=2170878
2009-10-07 15:18:13 -07:00
Andrew Stadler
458b43ae24 am 25920f67: Merge change I7a3482fd into eclair
Merge commit '25920f67e6ff67ee74637360aff072483b454a42' into eclair-plus-aosp

* commit '25920f67e6ff67ee74637360aff072483b454a42':
  Handle IMAP empty bodies more safely
2009-10-07 14:59:55 -07:00
Android (Google) Code Review
25920f67e6 Merge change I7a3482fd into eclair
* changes:
  Handle IMAP empty bodies more safely
2009-10-07 17:48:47 -04:00
Eric Fischer
ed5ce78dfd am 1cd5e5f0: Merge change I0aba41f9 into eclair
Merge commit '1cd5e5f03cc2f707ddfd46d439e6991db7454ab8' into eclair-plus-aosp

* commit '1cd5e5f03cc2f707ddfd46d439e6991db7454ab8':
  Import revised translations.   DO NOT MERGE
2009-10-07 12:08:30 -07:00
Fred Quintana
59259f72fb am 2c79efd8: Merge change I303304ab into eclair
Merge commit '2c79efd82736c4fd9a8351130b9410e9fb23f7f7' into eclair-plus-aosp

* commit '2c79efd82736c4fd9a8351130b9410e9fb23f7f7':
  changes from Sync Manager API Review: bug 2164262
2009-10-07 12:01:07 -07:00
Marc Blank
2ff5384fbf am e1b5e857: Merge change I2b0e3b10 into eclair
Merge commit 'e1b5e8574c86e4dcc184f1b3a4db352c9a631d99' into eclair-plus-aosp

* commit 'e1b5e8574c86e4dcc184f1b3a4db352c9a631d99':
  Help with another push inconsistency edge case (#2131432)
2009-10-07 12:00:58 -07:00
Andrew Stadler
24f568cdd2 am eb7752bf: Fix back-to-back message-id bugs
Merge commit 'eb7752bf695b2a93854e0bb89ddbbc2236bb9aea' into eclair-plus-aosp

* commit 'eb7752bf695b2a93854e0bb89ddbbc2236bb9aea':
  Fix back-to-back message-id bugs
2009-10-07 11:56:35 -07:00
Mihai Preda
50ce2430c1 am 85d718cb: MessageCompose: quote plain-text body if available, otherwise quote HTML body.
Merge commit '85d718cb0735de9069673fbf9834fa64459c2178' into eclair-plus-aosp

* commit '85d718cb0735de9069673fbf9834fa64459c2178':
  MessageCompose: quote plain-text body if available, otherwise quote HTML body.
2009-10-07 11:56:31 -07:00
Mihai Preda
f816c50ef8 am 1ef86a50: MessageView: scroll to (0,0) on message change.
Merge commit '1ef86a50f8f6bf09cb031359c1d7cf0902c4a441' into eclair-plus-aosp

* commit '1ef86a50f8f6bf09cb031359c1d7cf0902c4a441':
  MessageView: scroll to (0,0) on message change.
2009-10-07 11:51:58 -07:00
satok
4795cd8dc6 am d493ba25: Merge change Ie90b74aa into eclair
Merge commit 'd493ba257a1632a8de578e06a7df7ed311227887' into eclair-plus-aosp

* commit 'd493ba257a1632a8de578e06a7df7ed311227887':
  Avoid NPE at onRefresh in MessageList
2009-10-07 11:50:43 -07:00
Marc Blank
c4ab10526d am 8647be09: Merge change Id1c0bc24 into eclair
Merge commit '8647be095a75a25df98487d6e908a94f2d6fb076' into eclair-plus-aosp

* commit '8647be095a75a25df98487d6e908a94f2d6fb076':
  Correct issue with mail change parsing (fixes #2165649)
2009-10-07 11:47:53 -07:00
Fred Quintana
8cc764c184 am 794b7e92: account manager api review changes
Merge commit '794b7e9258db816aa7097779f20e99878e412eda' into eclair-plus-aosp

* commit '794b7e9258db816aa7097779f20e99878e412eda':
  account manager api review changes
2009-10-07 11:45:47 -07:00
Marc Blank
da894344f0 am 888ea64f: Merge change I26bb7b8b into eclair
Merge commit '888ea64f86e518de18806ef85bc7c16ba29f72f6' into eclair-plus-aosp

* commit '888ea64f86e518de18806ef85bc7c16ba29f72f6':
  Handle change from push to other intervals properly (#2165032)
2009-10-07 11:45:35 -07:00
Marc Blank
d3a46145f2 am 65aae18d: Merge change Iaf15ead1 into eclair
Merge commit '65aae18de30be842537d15f7b535243e96071c75' into eclair-plus-aosp

* commit '65aae18de30be842537d15f7b535243e96071c75':
  Add patent disclaimer to appropriate directories (#2079270)
2009-10-07 11:45:26 -07:00
Marc Blank
3b2159d988 am c9e05f16: Merge change I13229d84 into eclair
Merge commit 'c9e05f16b278967f929d18798d3f9d254096b01d' into eclair-plus-aosp

* commit 'c9e05f16b278967f929d18798d3f9d254096b01d':
  Change logging command to help debug Moto issue (#2165649)
2009-10-07 11:44:36 -07:00
Andrew Stadler
b6756688b1 Handle IMAP empty bodies more safely
Some IMAP servers return NIL if you BODY.PEEK[TEXT] a messsage with
no body, instead of the more canonical {0}CRLF.  Instead of messing with the
parser to deal with that, it makes more sense not to try and fetch empty
bodies.  So there are three changes:

* Don't fetch parts when size = 0
* Don't append "null" when there is null body text
* Slight change to attachment handling so size is reported >0
* Unit tests on some of the related lower-level protocol stuff

Bug http://b/issue?id=2160387

Change-Id: Ifb8fb0ed5ce7297908e1ae8d5a02dda5975c4a3c
2009-10-07 11:42:27 -07:00
Mihai Preda
a437e92853 am ba7decd8: Merge change I1197ac76 into eclair
Merge commit 'ba7decd89de39d3ed8d27e8e0e48ad517b435190' into eclair-plus-aosp

* commit 'ba7decd89de39d3ed8d27e8e0e48ad517b435190':
  MessageCompose: allow sending email when started through external intent.
2009-10-07 11:41:40 -07:00
Marc Blank
23a52ff65f am bb7a6c54: Merge change Icb449407 into eclair
Merge commit 'bb7a6c5463f7f9fea372079e3afd44cec79b12e5' into eclair-plus-aosp

* commit 'bb7a6c5463f7f9fea372079e3afd44cec79b12e5':
  Fix push failure edge case (#2161999)
2009-10-07 11:39:22 -07:00
Android (Google) Code Review
1cd5e5f03c Merge change I0aba41f9 into eclair
* changes:
  Import revised translations.   DO NOT MERGE
2009-10-07 14:36:57 -04:00
Eric Fischer
022b6f83b5 am 2787f001: Import revised translations. DO NOT MERGE
Merge commit '2787f001fb4b0341cc9949bffde62075b7c68b39' into eclair-plus-aosp

* commit '2787f001fb4b0341cc9949bffde62075b7c68b39':
  Import revised translations.  DO NOT MERGE
2009-10-07 11:35:26 -07:00
Marc Blank
ef80f8eaec am 1eb0af5d: Fix NPE issue w/ Contacts sync (#2160417)
Merge commit '1eb0af5d80514d03acca7ce040a8c01230f3c47e' into eclair-plus-aosp

* commit '1eb0af5d80514d03acca7ce040a8c01230f3c47e':
  Fix NPE issue w/ Contacts sync (#2160417)
2009-10-07 11:33:31 -07:00
Android (Google) Code Review
2c79efd827 Merge change I303304ab into eclair
* changes:
  changes from Sync Manager API Review: bug 2164262
2009-10-07 01:49:02 -04:00
Fred Quintana
84c975033d changes from Sync Manager API Review: bug 2164262 2009-10-06 17:19:32 -07:00