Commit Graph

1209 Commits

Author SHA1 Message Date
Eric Fischer
88a455115e am 1b21ad4d: Import corrected translations. DO NOT MERGE
Merge commit '1b21ad4d4b548784b6974696551c880b1c2eae9d' into eclair-plus-aosp

* commit '1b21ad4d4b548784b6974696551c880b1c2eae9d':
  Import corrected translations.  DO NOT MERGE
2009-11-02 23:30:52 -08:00
Eric Fischer
1b21ad4d4b Import corrected translations. DO NOT MERGE
Bug 2195208
2009-11-02 23:20:12 -08:00
Marc Blank
c5c1250d1e am 1e1d7cb1: Merge change Ie2804ddc into eclair
Merge commit '1e1d7cb189e7ea7164d1335539d68d3d3ca8c0e5' into eclair-plus-aosp

* commit '1e1d7cb189e7ea7164d1335539d68d3d3ca8c0e5':
  Fix #2225869 (Regression in attachment loading / Exchange 2003)
2009-10-30 14:33:55 -07:00
Android (Google) Code Review
1e1d7cb189 Merge change Ie2804ddc into eclair
* changes:
  Fix #2225869 (Regression in attachment loading / Exchange 2003)
2009-10-30 17:26:46 -04:00
Marc Blank
f6bdeb5f29 am 68942b93: Merge change I9733dc5d into eclair
Merge commit '68942b93a49c4bfed972ee0b5cffd301cebdacc8' into eclair-plus-aosp

* commit '68942b93a49c4bfed972ee0b5cffd301cebdacc8':
  Fix folder deletion; support folder rename (#2118439) DO NOT MERGE
2009-10-30 11:01:32 -07:00
Android (Google) Code Review
68942b93a4 Merge change I9733dc5d into eclair
* changes:
  Fix folder deletion; support folder rename (#2118439) DO NOT MERGE
2009-10-30 13:54:55 -04:00
Marc Blank
05dfc20853 Fix #2225869 (Regression in attachment loading / Exchange 2003)
* The fix to bug #2191778 inadvertently broke attachment loading for
  Exchange 2003 servers; the server responds with a 403 error (indicating
  an authentication issue)
* All other communications with the server work properly
* We use a slightly different set of calls in the case of attachments (we
  wanted to change as little as possible in the fix to #2191778) than we
  do in the other cases
* The fix here is to use the same calling sequence for attachments that we
  use elsewhere
* This fix has been observed to work on multiple servers, and in various
  SSL scenarios (on/off, trusted/untrusted)

Change-Id: Ie2804ddcbfa2b10edff42f7a3811734c325e933d
2009-10-29 20:10:46 -07:00
Marc Blank
94d2e99581 Fix folder deletion; support folder rename (#2118439) DO NOT MERGE
* Folder delete had a subtle error that could cause subsequent folder
  changes in the same sync to fail (using wrong end tag)
* Folder change (rename, move) wasn't implemented; this was added and
  tested.  The change is very straightforward and low risk.

Change-Id: I9733dc5da1a535c388e2feb299a641642ba531c2
2009-10-29 12:19:57 -07:00
Eric Fischer
1b0611cced am bb17f149: Import revised translations. DO NOT MERGE
Merge commit 'bb17f149abe263b36eaab1125e12ea266a60306a' into eclair-plus-aosp

* commit 'bb17f149abe263b36eaab1125e12ea266a60306a':
  Import revised translations.  DO NOT MERGE
2009-10-28 23:33:14 -07:00
Eric Fischer
bb17f149ab Import revised translations. DO NOT MERGE 2009-10-28 21:18:16 -07:00
Marc Blank
0386c563d0 am 0054c1a9: Merge change If12d0e7c into eclair
Merge commit '0054c1a9e699e5c90daed6fd0a30ffc8aec3955e' into eclair-plus-aosp

* commit '0054c1a9e699e5c90daed6fd0a30ffc8aec3955e':
  Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
2009-10-28 11:04:36 -07:00
Marc Blank
259386b10b am 2533132c: Merge change Ic29d3eac into eclair
Merge commit '2533132c84b9721b9692b284bbb14e5e0d237237' into eclair-plus-aosp

* commit '2533132c84b9721b9692b284bbb14e5e0d237237':
  Server validates even though server address is wrong DO NOT MERGE
2009-10-28 11:04:30 -07:00
Marc Blank
28f8d9ad58 am ea5b93d9: Handle moreAvailable true w/o changes (#2189704) DO NOT MERGE
Merge commit 'ea5b93d9b825e17eddf7f34cd37abef98e9949bd' into eclair-plus-aosp

* commit 'ea5b93d9b825e17eddf7f34cd37abef98e9949bd':
  Handle moreAvailable true w/o changes (#2189704) DO NOT MERGE
2009-10-28 11:04:25 -07:00
Android (Google) Code Review
0054c1a9e6 Merge change If12d0e7c into eclair
* changes:
  Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
2009-10-28 13:56:10 -04:00
Android (Google) Code Review
2533132c84 Merge change Ic29d3eac into eclair
* changes:
  Server validates even though server address is wrong DO NOT MERGE
2009-10-28 13:55:43 -04:00
Marc Blank
5d4bb79044 Go to combined inbox on notify for 2+ accounts (#2147265) DO NOT MERGE
* The problem is that PendingIntents aren't updated when a notification
  is updated, so the changed extras when a 2nd account gets a new message
  aren't seen by MessageList when it's started up upon tapping the
  notification (it uses the extras from the 1st account to get a new
  message)
* The fix is to use the newish (cupcake) flag in the PendingIntent that
  causes the extras in the PendingIntent to be updated

Change-Id: If12d0e7c6d3f256befeca98b560443395820737f
2009-10-28 08:57:45 -07:00
Marc Blank
e53de6985a Server validates even though server address is wrong DO NOT MERGE
* Fixes #2173664
* Make sure that not only is the OPTIONS command accepted, but that
  the server reports EAS versions and commands

Change-Id: Ic29d3eacfdc54d107600afc443964a1e8b3d5e59
2009-10-28 08:53:57 -07:00
Marc Blank
ea5b93d9b8 Handle moreAvailable true w/o changes (#2189704) DO NOT MERGE
* An Exchange log from Moto has shown sync behavior in which moreAvailable
  is set to true even though there are no changes in the sync response
  (i.e. the SyncKey is unchanged)
* This leads to long-lived looping which impacts battery life
* The fix is to recognize the behavior and prevent looping by
  setting moreAvailable = false

Change-Id: Icf45efbc24331c874c820b7b177e39b16df445d8
2009-10-22 14:49:26 -07:00
Eric Fischer
c607f8c251 am ba2d6de4: Import revised translations. DO NOT MERGE
Merge commit 'ba2d6de4b706cd226d0eb7910fef7ec77866d831' into eclair-plus-aosp

* commit 'ba2d6de4b706cd226d0eb7910fef7ec77866d831':
  Import revised translations.  DO NOT MERGE
2009-10-21 12:12:34 -07:00
Eric Fischer
ba2d6de4b7 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-10-21 10:44:46 -07:00
Marc Blank
90499a5415 am 55a97fc3: Fix attachment loading with "accept certificates" checked
Merge commit '55a97fc360ac549631af3aa3aad9833812674562' into eclair-plus-aosp

* commit '55a97fc360ac549631af3aa3aad9833812674562':
  Fix attachment loading with "accept certificates" checked
2009-10-19 10:41:05 -07:00
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