Commit Graph

1630 Commits

Author SHA1 Message Date
Marc Blank
8722e022d5 am bdaf801e: am f095e9df: Merge change Ib53e4411 into eclair-mr2
Merge commit 'bdaf801ea2fb8a2f11c31a43f3ba306e814bb25e'

* commit 'bdaf801ea2fb8a2f11c31a43f3ba306e814bb25e':
  Clear out orphaned messages in updates/deletes tables
2009-10-15 12:14:53 -07:00
Marc Blank
bdaf801ea2 am f095e9df: Merge change Ib53e4411 into eclair-mr2
Merge commit 'f095e9df5a8dbd97dcefecb479fbcce05ddb4d87' into eclair-mr2-plus-aosp

* commit 'f095e9df5a8dbd97dcefecb479fbcce05ddb4d87':
  Clear out orphaned messages in updates/deletes tables
2009-10-15 12:09:46 -07:00
Android (Google) Code Review
f095e9df5a Merge change Ib53e4411 into eclair-mr2
* changes:
  Clear out orphaned messages in updates/deletes tables
2009-10-15 15:03:41 -04:00
Marc Blank
ef83299b99 Clear out orphaned messages in updates/deletes tables
Case #1:
* Fixes #2184702
* Messages can be in the base Messages table, but also in
  Message_Deletes and Message_Updates; the latter two were not
  being purged of deleted messages.
* This CL deletes from all three tables when a Mailbox is deleted
* Also run a check for orphaned deletes/updates when the email
  provider's db is first opened
* Unit test updated to check for proper deletion
* Unit test for the provider check for orphans

Case #2:
* Fixes #2184708
* Messages in Outbox/Drafts can get modified or deleted, but the
  rows added to the updates/delete tables never get removed because
  the boxes don't sync
* Added code to SyncManager.ping (which gets notifications of these
  changes) to delete these rows

Change-Id: Ib53e441136b0da1e88bc220150d631999058a8f0
2009-10-15 10:58:00 -07:00
Mihai Preda
90b688caa3 am b5b63e92: am 3afd66cd: MessageCompose: disable "save as draft" button logic.
Merge commit 'b5b63e92a1989ee0eaa1a3c4e38a4d9e11adf9e2'

* commit 'b5b63e92a1989ee0eaa1a3c4e38a4d9e11adf9e2':
  MessageCompose: disable "save as draft" button logic.
2009-10-15 09:50:56 -07:00
Mihai Preda
b5b63e92a1 am 3afd66cd: MessageCompose: disable "save as draft" button logic.
Merge commit '3afd66cda8e466f23a8febb4906a8957abde86b7' into eclair-mr2-plus-aosp

* commit '3afd66cda8e466f23a8febb4906a8957abde86b7':
  MessageCompose: disable "save as draft" button logic.
2009-10-15 09:46:02 -07:00
Mihai Preda
3afd66cda8 MessageCompose: disable "save as draft" button logic.
Bug 2184404
Disable "save as draft" button when there are no changes to be saved.
2009-10-15 12:09:38 +02:00
satok
1401c28c69 am 374c565e: am 9bb382f4: Merge change I0bb16acd into eclair-mr2
Merge commit '374c565e07ce32d7a6f8b0ac8516493d1ee5c64e'

* commit '374c565e07ce32d7a6f8b0ac8516493d1ee5c64e':
  Fix the bug that the count of draft and trash icons are wrong.
2009-10-14 18:11:42 -07:00
satok
790ed78a4b am 3be8be10: am 7b16a280: Fix the apparance of title according to Gmail
Merge commit '3be8be105c46143b4307d62d7651af5fbf1cb4d6'

* commit '3be8be105c46143b4307d62d7651af5fbf1cb4d6':
  Fix the apparance of title according to Gmail
2009-10-14 18:06:50 -07:00
satok
374c565e07 am 9bb382f4: Merge change I0bb16acd into eclair-mr2
Merge commit '9bb382f43aca0b9afd849e2faf7e5dd450722281' into eclair-mr2-plus-aosp

* commit '9bb382f43aca0b9afd849e2faf7e5dd450722281':
  Fix the bug that the count of draft and trash icons are wrong.
2009-10-14 18:06:36 -07:00
Android (Google) Code Review
9bb382f43a Merge change I0bb16acd into eclair-mr2
* changes:
  Fix the bug that the count of draft and trash icons are wrong.
2009-10-14 21:02:18 -04:00
satok
3be8be105c am 7b16a280: Fix the apparance of title according to Gmail
Merge commit '7b16a280d9f0831868494e25559c6c0ac743575b' into eclair-mr2-plus-aosp

* commit '7b16a280d9f0831868494e25559c6c0ac743575b':
  Fix the apparance of title according to Gmail
2009-10-14 18:01:46 -07:00
satok
347a44af56 Fix the bug that the count of draft and trash icons are wrong.
BUG: 2159565

* Currently only the number of unread messages is shown.
* Fixed to show the number of all messages
2009-10-15 10:01:13 +09:00
satok
7b16a280d9 Fix the apparance of title according to Gmail
BUG: 2161477
2009-10-15 08:46:52 +09:00
Jean-Baptiste Queru
2411f28f6c am bf226c93: merge from open-source master
Merge commit 'bf226c93f93becc22b4bfce7f4a2878186e42c12'

* commit 'bf226c93f93becc22b4bfce7f4a2878186e42c12':
2009-10-14 16:12:32 -07:00
Jean-Baptiste Queru
bf226c93f9 merge from open-source master 2009-10-14 16:02:17 -07:00
Andrew Stadler
253798da0b am 3c717848: (-s ours) am f21d48ba: am 53123c2f: (-s ours) DO NOT MERGE. Prevent duplication of POP3 attachments
Merge commit '3c717848eae316d0b10940e2f84cb5b658cf531d'

* commit '3c717848eae316d0b10940e2f84cb5b658cf531d':
  DO NOT MERGE. Prevent duplication of POP3 attachments
2009-10-14 16:00:52 -07:00
Andrew Stadler
3c717848ea am f21d48ba: am 53123c2f: (-s ours) DO NOT MERGE. Prevent duplication of POP3 attachments
Merge commit 'f21d48ba8512767b200b350dd04d1a1000ed6d6e' into eclair-mr2-plus-aosp

* commit 'f21d48ba8512767b200b350dd04d1a1000ed6d6e':
  DO NOT MERGE. Prevent duplication of POP3 attachments
2009-10-14 15:55:46 -07:00
Andrew Stadler
f21d48ba85 am 53123c2f: (-s ours) DO NOT MERGE. Prevent duplication of POP3 attachments
Merge commit '53123c2f914db357fa5b4a8451b23c6be77314a5' into eclair-mr2

* commit '53123c2f914db357fa5b4a8451b23c6be77314a5':
  DO NOT MERGE. Prevent duplication of POP3 attachments
2009-10-14 15:51:02 -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
8fdca7890f am 3259aa9c: am 196f6187: Merge change I036f39c6 into eclair-mr2
Merge commit '3259aa9c74a83e857ce3e3c1a699e93c0274c1e1'

* commit '3259aa9c74a83e857ce3e3c1a699e93c0274c1e1':
  Prevent duplication of POP3 attachments
2009-10-14 10:34:12 -07:00
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