Commit Graph

1658 Commits

Author SHA1 Message Date
Andrew Stadler
3259aa9c74 am 196f6187: Merge change I036f39c6 into eclair-mr2
Merge commit '196f6187bb25c7ed1b2f6f5f3178152294b3cc22' into eclair-mr2-plus-aosp

* commit '196f6187bb25c7ed1b2f6f5f3178152294b3cc22':
  Prevent duplication of POP3 attachments
2009-10-14 10:29:52 -07:00
Android (Google) Code Review
196f6187bb Merge change I036f39c6 into eclair-mr2
* changes:
  Prevent duplication of POP3 attachments
2009-10-14 13:21:26 -04:00
Andrew Stadler
5b0a12c199 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

Fixes bug http://b/2084704
2009-10-14 08:20:59 -07:00
Andrew Stadler
bf279ce6b4 am 77c7ce54: am e3e02ada: am dee4e253: Do not trust server-provided content type for attachments
Merge commit '77c7ce54be778ca93a11069cc152b67d10bcff5f'

* commit '77c7ce54be778ca93a11069cc152b67d10bcff5f':
  Do not trust server-provided content type for attachments
2009-10-14 07:56:18 -07:00
Andrew Stadler
77c7ce54be am e3e02ada: am dee4e253: Do not trust server-provided content type for attachments
Merge commit 'e3e02adac681790ff4bea653e273f7e2b0eea35b' into eclair-mr2-plus-aosp

* commit 'e3e02adac681790ff4bea653e273f7e2b0eea35b':
  Do not trust server-provided content type for attachments
2009-10-14 07:46:46 -07:00
Andrew Stadler
e3e02adac6 am dee4e253: Do not trust server-provided content type for attachments
Merge commit 'dee4e25320c5154a5626446e1aa37f63ae97c48c' into eclair-mr2

* commit 'dee4e25320c5154a5626446e1aa37f63ae97c48c':
  Do not trust server-provided content type for attachments
2009-10-14 07:37:12 -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
Eric Fischer
a070fa2278 am 46251a07: (-s ours) am a745f9ae: Import revised translations. DO NOT MERGE
Merge commit '46251a0703319d73672b8a988c2c1529c1f054ac'

* commit '46251a0703319d73672b8a988c2c1529c1f054ac':
  Import revised translations.  DO NOT MERGE
2009-10-13 17:17:18 -07:00
Marc Blank
eae2e41f76 am 31d96b08: am 7cfda60b: am 4e424a33: Merge change Ie093215f into eclair
Merge commit '31d96b08901558d36bc2bcb654982e372f5b8eb8'

* commit '31d96b08901558d36bc2bcb654982e372f5b8eb8':
  Add truncation at 100k (EAS 2.5) and 200k (EAS 12) (#2184807)
2009-10-13 17:11:01 -07:00
Andrew Stadler
a48ef2ee28 am b48b1e9a: am b7c67a01: am 754240bc: Fix race condition in testMultiple()
Merge commit 'b48b1e9a819035de16b8af22dc4041f644f9241d'

* commit 'b48b1e9a819035de16b8af22dc4041f644f9241d':
  Fix race condition in testMultiple()
2009-10-13 17:09:31 -07:00
Mihai Preda
39fc7f7c94 am 10a1facb: am 2bc47f24: MessageView: use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET when viewing attachments.
Merge commit '10a1facb8d6e60974f5e573bcbc52f73e3eb10c4'

* commit '10a1facb8d6e60974f5e573bcbc52f73e3eb10c4':
  MessageView: use FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET when viewing attachments.
2009-10-13 17:05:55 -07:00
Eric Fischer
46251a0703 am a745f9ae: Import revised translations. DO NOT MERGE
Merge commit 'a745f9ae44de50208919e5e11b5be163d04648b3' into eclair-mr2-plus-aosp

* commit 'a745f9ae44de50208919e5e11b5be163d04648b3':
  Import revised translations.  DO NOT MERGE
2009-10-13 17:05:15 -07:00
Marc Blank
5c1f6f23c3 am a844e8a6: am 255dba84: am 2c74ee56: Prevent EmailAddressAdapter from leaking cursors; load in bg
Merge commit 'a844e8a69bca89ddb02a7e31141e383ff636d024'

* commit 'a844e8a69bca89ddb02a7e31141e383ff636d024':
  Prevent EmailAddressAdapter from leaking cursors; load in bg
2009-10-13 17:02:47 -07:00
Mihai Preda
6c8c940553 am 8a55972c: 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 '8a55972c5927e2df8d2261116e78acfdf455a6bc'

* commit '8a55972c5927e2df8d2261116e78acfdf455a6bc':
  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-13 17:01:27 -07:00
Andrew Stadler
b5a29a129b am e90fc949: am d5e7afa1: Remove obsolete resources & code
Merge commit 'e90fc94938f7ba3a4c78296e212021e5864c1a6b'

* commit 'e90fc94938f7ba3a4c78296e212021e5864c1a6b':
  Remove obsolete resources & code
2009-10-13 16:57:41 -07:00
Marc Blank
ce853897f9 am 42336c27: am 8be9b893: am ea878be1: Make sure we hold WakeLock during mail sending (fixes #2180551)
Merge commit '42336c27d3394bb7c2466d6f87981fd5e4b9c915'

* commit '42336c27d3394bb7c2466d6f87981fd5e4b9c915':
  Make sure we hold WakeLock during mail sending (fixes #2180551)
2009-10-13 16:57:37 -07:00
Marc Blank
e91a6d874d am 82aaf28b: am 0fd132d2: Merge change I5de51a43 into eclair-mr2
Merge commit '82aaf28b63179bcf018eca816ad9b57d79a38079'

* commit '82aaf28b63179bcf018eca816ad9b57d79a38079':
  Allow photo changes to be uploaded to Exchange (fixes #2179082)
2009-10-13 16:57:34 -07:00
Mike Cleron
6df0cf27af am 36cb41da: am 4cce00d6: am 479b22a2: Make multiselect buttons update when the list state changes
Merge commit '36cb41da267674faee631a48dbd9eb6dd2cd7c9a'

* commit '36cb41da267674faee631a48dbd9eb6dd2cd7c9a':
2009-10-13 16:52:51 -07:00
Evan Millar
a9203eec40 am 0daaa362: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp
Merge commit '0daaa3625c8f02ca2c8b79b9c44f8b3938a43388'

* commit '0daaa3625c8f02ca2c8b79b9c44f8b3938a43388':
  Make multiselect buttons update when the list state changes
2009-10-13 16:52:47 -07:00
Marc Blank
18d8b83986 am ae968df1: am 7a8bbfe0: am 4b59cfc8: Fix problem with timeouts and sending attachments (#2178288)
Merge commit 'ae968df16d331f5bb38b5a861eabf563b032e4fd'

* commit 'ae968df16d331f5bb38b5a861eabf563b032e4fd':
2009-10-13 16:52:29 -07:00
Mike Cleron
741ebcddd4 am 065d5c62: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp
Merge commit '065d5c6292b080f3f0e1507fc70e94a74ee9c9c2'

* commit '065d5c6292b080f3f0e1507fc70e94a74ee9c9c2':
  Fix problem with timeouts and sending attachments (#2178288)
2009-10-13 16:52:25 -07:00
Eric Fischer
bdbc5647c6 Reimport translations.
Change-Id: I2a37ff6a07f79136ac2bd3fb3e4db72371f45e8c
2009-10-13 16:32:56 -07:00
Eric Fischer
a745f9ae44 Import revised translations. DO NOT MERGE 2009-10-13 16:05:51 -07:00
Marc Blank
31d96b0890 am 7cfda60b: am 4e424a33: Merge change Ie093215f into eclair
Merge commit '7cfda60b2b2f8769079189727cee4c8fb9934d35' into eclair-mr2-plus-aosp

* commit '7cfda60b2b2f8769079189727cee4c8fb9934d35':
  Add truncation at 100k (EAS 2.5) and 200k (EAS 12) (#2184807)
2009-10-13 14:49:56 -07:00
Marc Blank
7cfda60b2b am 4e424a33: Merge change Ie093215f into eclair
Merge commit '4e424a33c29446d750790e360e43fb7c83ec0c6f' into eclair-mr2

* commit '4e424a33c29446d750790e360e43fb7c83ec0c6f':
  Add truncation at 100k (EAS 2.5) and 200k (EAS 12) (#2184807)
2009-10-13 14:46:04 -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
Mihai Preda
88f95c62ef am 51e7fa5d: am affa5660: MessageView: UI change prev/next arrows.
Merge commit '51e7fa5dc46463ee4d96ac9db633cd150940a22b'

* commit '51e7fa5dc46463ee4d96ac9db633cd150940a22b':
  MessageView: UI change prev/next arrows.
2009-10-13 14:27:54 -07:00
Rebecca Schultz Zavin
7102979272 am 9e72a844: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp
Merge commit '9e72a844d11439c17ad61ef942a951bff0ce6f34'

* commit '9e72a844d11439c17ad61ef942a951bff0ce6f34':
2009-10-13 14:27:50 -07: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
Eric Fischer
7821e7f6ef am 38fdd515: (-s ours) am 268d5faa: am b634dbf6: (-s ours) am 20b3ba23: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '38fdd515eeda01f3a03a54df1a2b58d732d1a3f6'

* commit '38fdd515eeda01f3a03a54df1a2b58d732d1a3f6':
  Import revised translations.  DO NOT MERGE
2009-10-13 11:56:58 -07:00
Marc Blank
72058581e6 am fae90688: am 676ea183: Merge change I15dccd1f into eclair-mr2
Merge commit 'fae9068859f58e7b4ad2926b802370781b9fb609'

* commit 'fae9068859f58e7b4ad2926b802370781b9fb609':
  Server validates even though server address is wrong
2009-10-13 11:53:54 -07:00
Marc Blank
4fea01b748 am f9191a95: am ff0c1f63: Merge change Ic2d782c1 into eclair-mr2
Merge commit 'f9191a955ab4c80f9c7ba5f7e20748a1a37dc065'

* commit 'f9191a955ab4c80f9c7ba5f7e20748a1a37dc065':
  Add checks to prevent duplicate service starts (fixes #2099830)
2009-10-13 11:53:50 -07:00
Mihai Preda
52f4c8cecc am e284eb9e: am ba0b7340: am 73032f46: Email: exit AsyncTask.onPostExecute() if the result is null or isCancelled().
Merge commit 'e284eb9e61f76d4cb195d1f490ab4709cefb77eb'

* commit 'e284eb9e61f76d4cb195d1f490ab4709cefb77eb':
2009-10-13 11:53:30 -07:00
Dima Zavin
53fc90bd25 am d3dfc2b7: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp
Merge commit 'd3dfc2b7401c8559a5ae722d9f63d8d0d39f2132'

* commit 'd3dfc2b7401c8559a5ae722d9f63d8d0d39f2132':
  Email: exit AsyncTask.onPostExecute() if the result is null or isCancelled().
2009-10-13 11:53:26 -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
Andrew Stadler
6ab8725f5a am b1265fde: am 3bacb738: am dfee3ff2: Fix a crash when you scroll MessageList to junk @ bottom
Merge commit 'b1265fde2ac790a74fddb42755602dfbeac9d52a'

* commit 'b1265fde2ac790a74fddb42755602dfbeac9d52a':
2009-10-12 12:39:20 -07:00
Dmitri Plotnikov
74cd5ab3cd am 9865567b: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp
Merge commit '9865567bfc4f86e7569e97e2114bac62b49b3b16'

* commit '9865567bfc4f86e7569e97e2114bac62b49b3b16':
  Fix a crash when you scroll MessageList to junk @ bottom
2009-10-12 12:39:16 -07:00
Andrew Stadler
b7a0bedb78 am c82cc866: am ec7bdde6: am 5b26bbe4: Switch QuickContact presentation from MEDIUM to LARGE.
Merge commit 'c82cc86603140027a28c817029803dc30b4bdcc0'

* commit 'c82cc86603140027a28c817029803dc30b4bdcc0':
2009-10-12 12:37:50 -07:00
David Krause
419431073d am 0abf305d: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Email into eclair-mr2-plus-aosp
Merge commit '0abf305d3333802dd6f36f56a6750cdf80fc4b74'

* commit '0abf305d3333802dd6f36f56a6750cdf80fc4b74':
  Switch QuickContact presentation from MEDIUM to LARGE.
2009-10-12 12:37:46 -07:00