Commit Graph

340 Commits

Author SHA1 Message Date
Mihai Preda
50a24d5e95 am 075e9d51: Added recursive limit check to renderAttachments method.
Merge commit '075e9d5104c0e23a6188677f5c9e99fcbcfdbc60'

* commit '075e9d5104c0e23a6188677f5c9e99fcbcfdbc60':
  Added recursive limit check to renderAttachments method.
2009-06-16 16:42:49 -07:00
Mihai Preda
d250bcd5cd resolved conflicts for merge of a830816f to master 2009-06-16 15:51:11 -07:00
Marc Blank
1f5a93936b Fix to bug in Message.save 2009-06-16 11:26:40 -07:00
Mihai Preda
075e9d5104 Added recursive limit check to renderAttachments method.
Integrates CL 149561 from p4 Docomo email.
Bug 1897000.
2009-06-15 18:10:29 -07:00
Mihai Preda
a830816fe2 Updating attachment thumbnail after attachment or inline image has been downloaded.
Integrates 149560 from Docomo email.
2009-06-15 18:01:19 -07:00
Andrew Stadler
b5903285dd Enable MessageView using provider.
Very primitive, just shows a few headers, and no navigation at all (you
can only go "back" from here.
2009-06-15 16:46:38 -07:00
Andrew Stadler
1da551bd08 Fix build break, master # 4712 2009-06-15 15:21:43 -07:00
Marc Blank
a290f503f1 Refactored EmailStore, EmailContent, EmailProvider
EmailStore goes away, replaced by EmailContent
All database activity is moved to EmailProvider
2009-06-15 14:49:11 -07:00
Andrew Stadler
879318ee30 Add message list (from provider) to FolderMessageList.
1.  Use proper AsyncTask for all cursors
2.  Convert to CursorTreeAdapter and get data from cursors
3.  (Temporarily) block all context menus and other things that would
    crash.

With this CL you can view folders and see the message list but you cannot
view the messages (that's next).
2009-06-15 09:25:39 -07:00
The Android Open Source Project
6eefd8b4d0 am a244abda: (-s ours) Do not merge. Merge commit \'14f3e16\' into donut
Merge commit 'a244abdad0abc2a2b9876cadcbb3e9c49aafbb4f'

* commit 'a244abdad0abc2a2b9876cadcbb3e9c49aafbb4f':
  IA 149719: Display Bcc: field if present...
  AI 149714: Download inline images for viewing if necessary and don't
2009-06-15 00:17:38 -07:00
The Android Open Source Project
a244abdad0 Do not merge. Merge commit '14f3e16' into donut 2009-06-15 00:08:40 -07:00
The Android Open Source Project
14f3e16793 IA 149719: Display Bcc: field if present... 2009-06-15 00:01:17 -07:00
Android (Google) Code Review
529e66ab6f Merge change 3802
* changes:
  Convert Accounts activity to use AsyncTask
2009-06-11 07:59:40 -07:00
Andrew Stadler
13b92c618e Convert Accounts activity to use AsyncTask 2009-06-10 15:53:02 -07:00
Eric Fischer
d98c406a7c am b726b7a0: Update Portuguese translations.
Merge commit 'b726b7a01bbc8872bde4a06a031e8b24d92fb11e'

* commit 'b726b7a01bbc8872bde4a06a031e8b24d92fb11e':
  Update Portuguese translations.
2009-06-10 15:33:50 -07:00
Eric Fischer
10dc32b4b0 am a2a6f543: am 0c2e5408: AI 149721: Import Portuguese translations.
Merge commit 'a2a6f5436ba00cc321b47db8c492c948da0ef53d'

* commit 'a2a6f5436ba00cc321b47db8c492c948da0ef53d':
  AI 149721: Import Portuguese translations.
2009-06-10 15:32:26 -07:00
Eric Fischer
b726b7a01b Update Portuguese translations. 2009-06-10 15:11:01 -07:00
Eric Fischer
a2a6f5436b am 0c2e5408: AI 149721: Import Portuguese translations.
Merge commit '0c2e540856d057e4d692e9db7864d673ab0708cd' into donut

* commit '0c2e540856d057e4d692e9db7864d673ab0708cd':
  AI 149721: Import Portuguese translations.
2009-06-10 12:30:05 -07:00
Eric Fischer
0c2e540856 AI 149721: Import Portuguese translations.
Automated import of CL 149721
2009-06-10 12:26:07 -07:00
Mihai Preda
0dff228dc7 AI 149714: Download inline images for viewing if necessary and don't
delete attachment cache files if these are inline images.
  The purpose of original logic of loadAttachmnet() is to keep
  at most one attachment cache, probably to limit the size of
  cached file.  But it also purges all inline images.
  Integrates CL 149551 from DocomoEmail.
  BUG=1884385,1860250

Automated import of CL 149714
2009-06-10 10:48:32 -07:00
Andrew Stadler
68a9ccfcde final cleanups to get basic message operations working properly.
* Generate compatibility UUID early enough to stick, so our localstore
db's are created correctly and not recreated over and over again.
* Compose menu items working
* Fix single-account mode (go straight to inbox)
* Lightweight Account projections where possible
* Properly show/hide default account checkbox (during new acct screens)

What works:
* All unit tests
* Editing existing accounts
* Create new accounts
* Checking account settings against server
* Mail sync using accounts
* Viewing mailboxes
* Viewing messages
* Composing messages

What breaks (in approx order of planned fixes)
* Some details of account editing
* Import of existing accounts
2009-06-09 16:13:05 -07:00
Andrew Stadler
d2b0efa2f5 Cleanup broken unit tests from previous submit. This now works:
What works:
* All unit tests
* Editing existing accounts
* Create new accounts
* Checking account settings against server
* Mail sync using accounts
* Viewing mailboxes

What breaks (in approx order of planned fixes)
* Viewing messages
* Composing messages
* Some details of account editing
* Import of existing accounts
2009-06-09 14:46:30 -07:00
Andrew Stadler
c0033f24a2 Convert remainder of app to use provider-based accounts
What works:
* Unit tests, except for com.android.email.activity.setup.*
* Editing existing accounts
* Create new accounts
* Checking account settings against server
* Mail sync using accounts
* Viewing mailboxes

What breaks (in approx order of planned fixes)
* Unit tests in com.android.email.activity.setup.*
* Viewing messages
* Composing messages
* Some details of account editing
* Import of existing accounts
2009-06-08 15:42:40 -07:00
Mihai Preda
7ac2b6e048 am a9576bda: resolved conflicts for merge of 7403a54738 to donut
Merge commit 'a9576bdad6d9711c9e790fdbad3cbb1ab5c5fb03'

* commit 'a9576bdad6d9711c9e790fdbad3cbb1ab5c5fb03':
  AI 149664: Move escapeChar from MessageView to EmailHtmlUtil.
2009-06-08 12:23:43 -07:00
Mihai Preda
a9576bdad6 resolved conflicts for merge of 7403a54738 to donut 2009-06-08 20:52:12 +02:00
Mihai Preda
7403a54738 AI 149664: Move escapeChar from MessageView to EmailHtmlUtil.
Integrate CL 148437 from DocomoEmail.
  BUG=1860250

Automated import of CL 149664
2009-06-08 11:21:18 -07:00
Andrew Stadler
294a4fd0c6 Enable creation of new accounts using provider-based accounts.
What works:
* Editing existing accounts
* Create new accounts
* Checking account settings against server

What breaks (in approx order of planned fixes)
* Some details of account editing
* Viewing mailboxes & messages
* Mail sync using accounts
* Import of existing accounts
2009-06-05 16:09:18 -07:00
Mihai Preda
da93b380d1 am 23a27697: Merge branch \'readonly-p4-donut\' into donut
Merge commit '23a27697963642d6450b70dd83709492c1bdde72'

* commit '23a27697963642d6450b70dd83709492c1bdde72':
  AI 149607: Add relevant title to attachment file chooser.
2009-06-05 11:41:33 -07:00
Mihai Preda
c4a9e52f49 am cf4a3aea: Merge branch \'readonly-p4-donut\' into donut
Merge commit 'cf4a3aea3fa31210deca572c6c933034036fe558'

* commit 'cf4a3aea3fa31210deca572c6c933034036fe558':
  AI 149604: Localized the special folders name in FolderMessageView.
2009-06-05 11:41:21 -07:00
Mihai Preda
84bba2c57b am 9c629105: Merge branch \'readonly-p4-donut\' into donut
Merge commit '9c62910550ee132ead267fa465a726f917db7fd0'

* commit '9c62910550ee132ead267fa465a726f917db7fd0':
  AI 149603: Show progress dialog while loading attachment. Fixed possible ArrayIndexOutOfBoundsException in message view.
2009-06-05 11:41:20 -07:00
Mihai Preda
e773093138 am f53ef9b5: Merge commit \'goog/donut\' into donut
Merge commit 'f53ef9b50ca91860646371c670676593a6b50173'

* commit 'f53ef9b50ca91860646371c670676593a6b50173':
2009-06-05 11:41:08 -07:00
Mihai Preda
8043caa55a am 4dad6670: Merge branch \'readonly-p4-donut\' into donut
Merge commit '4dad6670724a57e560aac3d07bfda0a1f05fd2f2'

* commit '4dad6670724a57e560aac3d07bfda0a1f05fd2f2':
  AI 149600: Fixed message view web link be more robust.
2009-06-05 11:41:05 -07:00
Mihai Preda
23a2769796 Merge branch 'readonly-p4-donut' into donut 2009-06-05 11:38:31 -07:00
Mihai Preda
a00eb291f1 AI 149607: Add relevant title to attachment file chooser.
Delete the original source message only when the message is in Drafts folder.
  If the original message is in the other folder than Drafts, it should be
  retained.
  Integrates 149194,149306,149459 from DocomoEmail.
  BUG=1860250,1887835

Automated import of CL 149607
2009-06-05 11:36:17 -07:00
Mihai Preda
cf4a3aea3f Merge branch 'readonly-p4-donut' into donut 2009-06-05 10:50:26 -07:00
Mihai Preda
7eb313fb00 AI 149604: Localized the special folders name in FolderMessageView.
Integrates 149049,149217 from DocomoEmail.
  BUG=1860091,1860250

Automated import of CL 149604
2009-06-05 10:48:20 -07:00
Mihai Preda
9c62910550 Merge branch 'readonly-p4-donut' into donut 2009-06-05 10:35:38 -07:00
Mihai Preda
c099563834 AI 149603: Show progress dialog while loading attachment. Fixed possible ArrayIndexOutOfBoundsException in message view.
Integrates 149422,149510,149516 from DocomoEmail.
  In some situation, email header From: might be empty or have
  illegal email address.  The assumption that From: must exist
  will be violated and causes ArrayIndexOutOfBoundsException.
  BUG=1741969,1890770,1860250

Automated import of CL 149603
2009-06-05 10:33:22 -07:00
Mihai Preda
f53ef9b50c Merge commit 'goog/donut' into donut 2009-06-05 10:08:37 -07:00
Mihai Preda
4dad667072 Merge branch 'readonly-p4-donut' into donut 2009-06-05 08:38:58 -07:00
Mihai Preda
980385b0f9 AI 149600: Fixed message view web link be more robust.
Integrates 149300 from DocomoEmail.
  This is work around for
  - Regex.WEB_URL_PATTERN would not handle protocol part case
  insensitive correctly.
  - WebView only could follow the href link that protocol part
  is lower case.
  BUG=1860250,1842508

Automated import of CL 149600
2009-06-05 08:34:52 -07:00
Andrew Stadler
f5df628991 am a392e070: Add android.permission.WRITE_EXTERNAL_STORAGE Add unit test to verify writeable to sdcard.
Merge commit 'a392e070bc9590986e57ef6a89bed34f7efc10d0'

* commit 'a392e070bc9590986e57ef6a89bed34f7efc10d0':
  Add android.permission.WRITE_EXTERNAL_STORAGE
2009-06-04 23:48:25 -07:00
Mihai Preda
372c12bfbb am a15503a4: Merge branch \'readonly-p4-donut\' into donut
Merge commit 'a15503a4a6cf46e810bde4aedc846680ed288c1c'

* commit 'a15503a4a6cf46e810bde4aedc846680ed288c1c':
  AI 149578: Fixed possible NullPointerException in MessageCompose.
2009-06-04 22:43:34 -07:00
Mihai Preda
18106fe981 am 7330fe49: Merge branch \'readonly-p4-donut\' into donut
Merge commit '7330fe4953c39741376bdd8cb3e5c2c03068b0aa'

* commit '7330fe4953c39741376bdd8cb3e5c2c03068b0aa':
  AI 149573: Display To: instead of From: in Drafts folder && Display unread message count for inbox, total message count everywhere else.
2009-06-04 22:43:17 -07:00
Andrew Stadler
a392e070bc Add android.permission.WRITE_EXTERNAL_STORAGE
Add unit test to verify writeable to sdcard.

Fixed bug http://b/issue?id=1883487
2009-06-04 15:16:43 -07:00
Mihai Preda
a15503a4a6 Merge branch 'readonly-p4-donut' into donut 2009-06-04 12:50:26 -07:00
Mihai Preda
e6ec9d86e8 AI 149578: Fixed possible NullPointerException in MessageCompose.
Integrates 148996,149295 from imode email.
  BUG=1862155,1798576,1860250

Automated import of CL 149578
2009-06-04 12:48:20 -07:00
Mihai Preda
7330fe4953 Merge branch 'readonly-p4-donut' into donut 2009-06-04 11:40:35 -07:00
Mihai Preda
70798a7892 AI 149573: Display To: instead of From: in Drafts folder && Display unread message count for inbox, total message count everywhere else.
Integrates from imode email: 148948,149107,149247,149248,149249,149287.
  BUG=1591391,1842520,1860085,1459866,1860250

Automated import of CL 149573
2009-06-04 11:38:26 -07:00
Mihai Preda
98475b1d7c am 438275b2: Merge branch \'readonly-p4-donut\' into donut
Merge commit '438275b283224a9f830e42d4e645981d1f73589b'

* commit '438275b283224a9f830e42d4e645981d1f73589b':
  AI 149564: Escape special characters such as '<>&' in text/plain for display in WebView.
2009-06-04 09:46:29 -07:00