Commit Graph

262 Commits

Author SHA1 Message Date
Marc Blank
cf1a862526 Fix cursor logic for multiple notifications; close cursor
Change-Id: I0b2a46d1a89f9d4704929580324ee25f5c19185e
2012-05-29 08:49:40 -07:00
Marc Blank
6fb157c90c Fix problem with empty content disposition
* And while we're at it, fix a repeating crash related to
  notifications.

Bug: 6561972
Change-Id: I44f2441bf7bfe4b364a605c0d7c8bae83229837a
2012-05-25 16:18:39 -07:00
Marc Blank
7c94a65c4a Merge "Support accountUri in Conversation cursor" into jb-ub-mail 2012-05-25 14:02:26 -07:00
Marc Blank
f4a1f8e6bd Support accountUri in Conversation cursor
Change-Id: Id1aa66df782a8ed1fb3d407a1d0a5f7b0eb5cf34
2012-05-25 13:51:32 -07:00
Paul Westbrook
b084f6409a New notifications for Email2
Merges the following changes into jb-ub-mail

https://android-git.corp.google.com/g/191855
https://android-git.corp.google.com/g/191887
https://android-git.corp.google.com/g/192597

Change-Id: I34d927952b6a80fdd454a0f174711e0e4c740502
2012-05-25 13:01:28 -07:00
Marc Blank
28d2fb96f1 Don't allow undo for deletions in trash
Bug: 6282899
Change-Id: I23d0c768a71e08d493f42ee2c8b08ae95dbc1cf4
2012-05-25 10:50:23 -07:00
Marc Blank
d4937049b2 Notify widgets when mailbox contents change
Bug: 6309668
Change-Id: Ibc7fff796f454e1ae4fc56a0a9282021865b4fc9
2012-05-23 13:37:33 -07:00
Marc Blank
2a5ea1af54 Manually merge change from jb-dev
Bug: 6479301
Change-Id: I7c2bce9920ede3b03f60c5bf7d02a9152c84941e
2012-05-22 11:40:06 -07:00
Marc Blank
9037a64ead Make viewables handling more sensible in MimeUtility
* We had some relatively complicated rules for what was "viewable",
  but there are cases missed.
* It's simplest to consider all non-attachment images and text as
  viewable.

Bug: 6524411
Change-Id: I57844916af4ded683e69932b4effd5546ec42ad2
2012-05-21 13:01:46 -07:00
Marc Blank
0d296a66d8 Port new EmailClientConfigurationManager code from jb-dev
Change-Id: Ibb07415a2b78e6160999d44b21ccd24406447f88
2012-05-21 09:52:19 -07:00
Marc Blank
323eea8ac8 Don't use a repeating alarm for AttachmentDownloadService
* Guarantees we can't have runaway alarms
* Manually merged from Email1

Bug: 6494254
Change-Id: I7f272f650ab34d50ec71ad503951ada3bbf203af
2012-05-18 14:09:46 -07:00
Paul Westbrook
671965f494 Merge "Build against the JB SDK" into jb-ub-mail 2012-05-17 17:09:08 -07:00
Paul Westbrook
1f639e958e Build against the JB SDK
Change-Id: Ibc4208f26870545aaacebd3dc36fdd56a904d90e
2012-05-17 16:37:42 -07:00
Marc Blank
168dec146f Add account color to account spinner
* For combined view

Bug: 6281321
2012-05-17 15:15:28 -07:00
Marc Blank
def815811a Merge "Update jb-dev to jb-ub-mail" into jb-ub-mail 2012-05-16 16:26:17 -07:00
Marc Blank
d10022e4da Update jb-dev to jb-ub-mail 2012-05-16 16:23:34 -07:00
Mindy Pereira
2d804a12ff Merge "Remove Email2 overrides. Use UnifiedEmail styling." into jb-ub-mail 2012-05-16 15:13:24 -07:00
Mindy Pereira
160df820fa Remove Email2 overrides. Use UnifiedEmail styling.
Change-Id: I40b138f58464678a98854902b976581b7210fa7b
2012-05-16 15:08:32 -07:00
Eric Fischer
f8f97bb1ef Import translations. DO NOT MERGE
Change-Id: Ifcfb1289a255ed007a09e25a3a18a4cab73f1bb3
2012-05-15 15:52:33 -07:00
Eric Fischer
3b6f470ef2 Import translations. DO NOT MERGE
Change-Id: Iad8ed5cfdad8c8cc39c8bc5f7558c5d243fe1e43
2012-05-14 11:50:19 -07:00
Eric Fischer
ca1c8af924 Import translations. DO NOT MERGE
Change-Id: I7d6d234de4be71a35d293b0bdf641c3bfcbda665
2012-05-11 12:34:38 -07:00
Marc Blank
40f3516047 Merge "Add account color to message list for combined account" into jb-ub-mail 2012-05-08 14:14:19 -07:00
Marc Blank
84da65d222 Add account color to message list for combined account
Change-Id: I284179feadac4bdd1677c33c5be3f00e865c1430
2012-05-08 14:09:21 -07:00
Eric Fischer
70ffb20e42 Import translations. DO NOT MERGE
Change-Id: If541398f08ee734121888998f67ce237c8b309d0
2012-05-08 11:38:24 -07:00
Eric Fischer
cbed5b6498 Import translations. DO NOT MERGE
Change-Id: I7e96d1b90b63972397cea17026d55816bde670f5
2012-05-07 11:32:01 -07:00
Eric Fischer
6ad51ff2cc Import translations. DO NOT MERGE
Change-Id: I4103ff42285f6e591e26aa25457ea7a3766951d8
2012-05-03 13:15:20 -07:00
Eric Fischer
f3a27fec56 Import translations. DO NOT MERGE
Change-Id: I3a0a145ea84893c83d0d2a887c16faac2480a903
2012-05-02 11:37:25 -07:00
Marc Blank
d534b58f47 Merge "Compatibility upgrade from Email1 to Email2" into jb-ub-mail 2012-05-01 13:29:39 -07:00
Eric Fischer
d6d845eccd Import translations. DO NOT MERGE
Change-Id: If1463107c3a557b18b2618cf1086c7eb14ce0b30
2012-05-01 10:55:58 -07:00
Marc Blank
270ed83636 Compatibility upgrade from Email1 to Email2
Change-Id: I6554c91b1078c266183629e0a366bc4b4ac68d7f
2012-05-01 09:29:42 -07:00
Eric Fischer
c893af4fa0 Import translations. DO NOT MERGE
Change-Id: I438e659c5c497290a252734eae810bdeb2dd08a2
2012-04-30 11:12:28 -07:00
Marc Blank
9f2e3b7179 Merge "Rework reply/forward to use unified-style data" into jb-ub-mail 2012-04-30 08:47:17 -07:00
Marc Blank
afb34d19ee Rework reply/forward to use unified-style data
* Deprecate fields no longer used in Body table

Bug: 6393061

Change-Id: I48f41063667f6edef43756b16acdfd1e65ef554c
2012-04-30 08:38:47 -07:00
Marc Blank
c75cd15c96 Use "Inbox" rather than "INBOX" for, well, "inbox"
Bug: 6366703
Change-Id: If9a43513990802203431ecbbcd96247b2db8e93f
2012-04-29 20:14:48 -07:00
Paul Westbrook
6a7d10e1c3 Merge 'goog/jb-dev' into 'goog/jb-ub-mail'
Change-Id: I29ca31c2ec3b773a484e8c3b3880057852479125
2012-04-27 15:01:08 -07:00
Marc Blank
f05dba090c Merge "Add quoted text start pos to Body table" into jb-dev 2012-04-27 13:54:55 -07:00
Marc Blank
c6f104f2a7 Add quoted text start pos to Body table
Change-Id: Ie80fbb686382a8d38ea09d05b4757a82169be3fc
2012-04-27 13:37:56 -07:00
Paul Westbrook
f402687b72 Merge "Build against the ICS SDK" into jb-ub-mail 2012-04-27 13:29:28 -07:00
Paul Westbrook
7a7508c641 Build against the ICS SDK
Change-Id: Ib6429d43420b1382c8dfc81d30568c62cbbf92b6
2012-04-27 12:40:13 -07:00
Eric Fischer
9fd8864433 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-04-27 11:10:39 -07:00
Eric Fischer
ee56777b06 Import translations. DO NOT MERGE
Change-Id: I4075aac1b807ef02400b8c1d517ea14f1b7517a6
2012-04-27 11:06:24 -07:00
Eric Fischer
bd9e17a072 Import translations. DO NOT MERGE
Change-Id: If4b740adde8044002746e4df539200f999a47bad
2012-04-27 11:05:20 -07:00
Marc Blank
d053465149 Have "view in calendar" directly open the event if possible
Bug: 5011918
Change-Id: I872ca6b78af08092017aa02810a07497a82758c1
2012-04-27 10:05:52 -07:00
Marc Blank
5ac4978680 Merge "Add preliminary support for viewing events" into jb-dev 2012-04-27 09:36:11 -07:00
Marc Blank
c8ae6156da Merge "Make sure all drafts are "read"" into jb-dev 2012-04-27 09:21:45 -07:00
Marc Blank
597cfcf7ce Add preliminary support for viewing events
Bug: 5011918

Change-Id: I573ed44b09f5e695d04fd081ea8af221fb396d94
2012-04-27 09:07:40 -07:00
Marc Blank
31a5e5c58d Make sure all drafts are "read"
Bug: 6408601
Change-Id: I99dc9a1f017d67474540c07a76d11ec33c0ec3d8
2012-04-26 23:24:37 -07:00
Marc Blank
b3cf559736 Merge "Confirm calendar invite response, and delete message" into jb-dev 2012-04-26 20:41:47 -07:00
Marc Blank
519196dcf9 Confirm calendar invite response, and delete message
* Also, make sure that deletions update totals
* And that undo does the same

Bug: 6399958

Change-Id: I0250c34ce2515327f2a5bffec0cd059af9cefac4
2012-04-26 17:45:45 -07:00
Andy Huang
b354794c21 hide text zoom pref in Email2
Bug: 5287963
Change-Id: I6661149a8e8a98d5cebb9ea0fcfe6b4bc7976ff7
2012-04-26 16:50:35 -07:00
Marc Blank
c6297f8272 Handle clearing notifications via respond()
Bug: 6348210
Change-Id: I7040361123c86915d01e5b460f8c1f1e35f2a75b
2012-04-26 13:21:01 -07:00
Marc Blank
1f6dab6685 Don't allow sending from Combined account
Bug: 6319124
Change-Id: I0635bd59e2f53ce885e90f79be3611cebdb67f92
2012-04-24 11:56:06 -07:00
Marc Blank
b027bdadfa Make sure notifications run when app starts
Bug: 6346814

Change-Id: I1ddfe8b7fbc5225c1ada71c5211eb253a3952d77
2012-04-24 10:17:19 -07:00
Marc Blank
08ffba4788 Support calendar invite response from UIProvider
Change-Id: I086c956f0c05f836ce370a992606838e906b91dd
2012-04-24 09:08:58 -07:00
Marc Blank
7effcc3fdf Use correct icon for multiple received messages
Bug: 6382242
Change-Id: I24c99f3f2279ab38cc8ff0f82242a9f24a110670
2012-04-23 14:45:31 -07:00
Marc Blank
cec3719547 Merge "Prevent NPE if message not found" 2012-04-23 14:13:56 -07:00
Marc Blank
ca855f547d Prevent NPE if message not found
Bug: 6324875
Change-Id: Ie82ef1c33e1b9db7178a183df00cca2c80aecf35
2012-04-23 13:59:22 -07:00
Marc Blank
80e19ad650 Make sure TempDirectory is set when using EmailServiceProxy
Bug: 6361241

Change-Id: I8fa328ec0b61a8f1710634bc8b946076efba0dcf
2012-04-23 13:54:30 -07:00
Marc Blank
2f49645c73 Notify on correct account when mailboxes are added
Change-Id: I511aebf76036a2e977bb63bce2d90206c45817f5
2012-04-23 11:39:12 -07:00
Marc Blank
571547336e Remove "Delete account" from Email settings
* This is compatible with how things are done in Gmail

Change-Id: I5389bd34069803d92276b690fe0c04963ca1f2b8
2012-04-23 10:36:14 -07:00
Marc Blank
ab7d500c06 Merge "Restore some sanity to IMAP sync" 2012-04-23 09:16:52 -07:00
Marc Blank
264d514075 Prevent NPE in account/folder query when they no longer exist
Change-Id: I65d72bae84d26142ba37b365effe1d9655de1e2c
2012-04-23 08:42:41 -07:00
Marc Blank
2af67eba86 Restore some sanity to IMAP sync
* Ignore the small/large message distinction
* Get rid of loadMore; let the sync always get the text parts
  (this avoids parsing a potentially huge message just to get at
  the text parts)
* If we have a multipart/alternative and it has html text, don't
  bother loading the plain part

Bug: 6325247

Change-Id: Ib557b20c517f0dee2b5f67d0d57d5304a0cba936
2012-04-22 22:03:03 -07:00
Marc Blank
7072612991 Prevent OOM that we've seen unrepeatably w/ IMAP literals
Bug: 6325247
Change-Id: If00a509cebeb75a2375159ba3045fa9089b4b4b2
2012-04-20 18:40:37 -07:00
Marc Blank
045a4ca46e Fix icon for email widget
Change-Id: If93a0c8f5676da66c8e07dd599f7b83ec5ab1f5d
2012-04-20 12:08:21 -07:00
Marc Blank
228b1753a4 Clear reply/forward flag when move message to sent items
Bug: 6364495
Change-Id: I52d3ede175ee4f1575d54543d82b7c4b32b6ec25
2012-04-19 13:45:47 -07:00
Marc Blank
10c4d8814e Merge "Don't crash if we can't create notification intent" 2012-04-19 12:59:42 -07:00
Marc Blank
ea8841a001 Don't crash if we can't create notification intent
Bug: 6359505
Change-Id: I7fa25a1f57937b01859fe3ae5ce5729b06858400
2012-04-19 12:52:30 -07:00
Eric Fischer
aadbdda5a1 Import translations. DO NOT MERGE
Change-Id: I237bfbee1a477059ce7d6eb97399a71457d0aec9
2012-04-19 11:29:36 -07:00
Mindy Pereira
30a6b1fc77 Merge "Usse attachmentsJson." 2012-04-17 08:38:52 -07:00
Marc Blank
97d8157dc6 Fix POP3 message sending (never worked)
* Apparently, this hadn't been tested
* Also small tweak for deleted attachments

Change-Id: Ia07db2c77f7e6dcfa558a262280010f7375c32f0
2012-04-17 08:34:10 -07:00
Mindy Pereira
0729415a3e Usse attachmentsJson.
Change-Id: If8af8c1d10359a8024bcb63ad1ba11f008d8f22f
2012-04-16 15:58:37 -07:00
Marc Blank
65381f907b Merge "Don't use SYNCED_MESSAGE_URI for POP3/Drafts/Outbox/Search" 2012-04-16 15:37:12 -07:00
Marc Blank
e7cab0a8a4 Merge "When provider starts, initialize folder status" 2012-04-16 13:52:05 -07:00
Marc Blank
188d4996c8 Merge "Allow undo for combined account" 2012-04-16 13:51:22 -07:00
Marc Blank
37e2be2556 Don't use SYNCED_MESSAGE_URI for POP3/Drafts/Outbox/Search
Bug: 6330408
Change-Id: I84114d95fe4cf2a0137e2e9108ba349e58e21788
2012-04-16 13:44:38 -07:00
Marc Blank
ba30ce9343 Use right uri for combined account compose
Bug: 6323241
Change-Id: I9e705b94363c7a311cdb7cbd04da60aeb63f8fd2
2012-04-16 11:18:01 -07:00
Marc Blank
c1ccdc5f9b When provider starts, initialize folder status
Bug: 6316761

Change-Id: I916ff7b6881971f685420972635423567cd97761
2012-04-16 10:32:22 -07:00
Marc Blank
1a69a28f62 Allow undo for combined account
Bug; 6323124

Change-Id: I62ff6ee34871e6d083e22ff9f2b9e3e4193c7080
2012-04-16 09:37:20 -07:00
Eric Fischer
49927a0ae4 Merge "Import translations. DO NOT MERGE" 2012-04-13 16:42:10 -07:00
Marc Blank
3dce9c07be Clear INITIAL_SYNC_NEEDED status after first sync
Change-Id: I9d7a3ae4d3dbbc4af82aae8405fa7e4e38bc8f34
2012-04-13 12:21:42 -07:00
Eric Fischer
fc093a7b88 Import translations. DO NOT MERGE
Change-Id: I9b0c4c8816e5fff58e72c10118b2352a23e282c7
2012-04-13 11:31:43 -07:00
Marc Blank
83ecabc8b2 Add logging
Change-Id: Id1c929591ad0fb451c8a8ba391f80108e2febb5d
2012-04-12 18:10:41 -07:00
Marc Blank
733aef1204 Rework of attachment loading/saving
* Respect the destination for attachment downloading
* Rework attachment load/save for IMAP/POP

Change-Id: I94fdcea5ec6d397aba554fec3753b2de9cb5f1dd
2012-04-12 17:24:41 -07:00
Marc Blank
b6d43d73c1 Add support for downloading/forwarding stupidly forwarded atts
Bug: 6315979
Change-Id: I55bb51278d50b40730d279b67bf425ed6b72a616
2012-04-12 12:11:02 -07:00
Andy Huang
dda6f1de94 build with support libs for ViewPager
Change-Id: I9f0f68ec2b4b6b6fe98dddb48c5a38cf5e1ef76d
2012-04-11 23:14:48 -07:00
Marc Blank
26cda14a0f Merge "Fix security notifications & crash" 2012-04-11 22:36:35 -07:00
Marc Blank
fec41d34ba Fix security notifications & crash
Bug: 6318784
Change-Id: Iadba96fc38896edf4a22dde2d02430fcb6bf1e29
2012-04-11 19:54:12 -07:00
Eric Fischer
f499c7a4f1 Import translations. DO NOT MERGE
Change-Id: Ia178a1168c4adf17687f6147a24fdabc1e4f52a7
2012-04-11 11:24:07 -07:00
Eric Fischer
2d8dd0f2d1 Merge "Import translations. DO NOT MERGE" 2012-04-10 14:14:34 -07:00
Vikram Aggarwal
d1241db03e Merge "Add the starred folder type" 2012-04-10 13:00:26 -07:00
Vikram Aggarwal
cd1f1f578a Add the starred folder type
Change-Id: I41eeea30aff21c8d6dbc82ab73cc8f13136dfffa
2012-04-10 12:57:59 -07:00
Marc Blank
3b22996245 Make sure sync sets up TempDirectory
Bug: 6316466
Change-Id: I7a7254692db3d53cb16af7b0faa9201a574eab7f
2012-04-10 12:48:00 -07:00
Marc Blank
6e4b9e3907 Oops; fix about-to-be-broken build
Change-Id: I2086eee46eb371a91aacccfd6021704e8875fb00
2012-04-10 12:22:40 -07:00
Marc Blank
ea4bcad7ba Use real email icon in Email2
Change-Id: I12f65f244aed747b6f3717f4ca9ddc3c6f1d63df
2012-04-10 12:17:35 -07:00
Eric Fischer
130d9f4c10 Import translations. DO NOT MERGE
Change-Id: I49ad4575872dd07985914034e29271d77dcab8cc
2012-04-10 12:10:49 -07:00
Marc Blank
2e4b884c1d Set forwarded/replied-to flags in ref message
* Also, little bit of cleanup

Bug: 6282892
Change-Id: Ie36e6ce7eaedaed59b5b9480b8ce4eac2025c620
2012-04-10 11:11:55 -07:00
Marc Blank
157a9bd57d Set acct sync status to "initial sync needed" until inbox exists
* Notify on account when mailboxes are added

Change-Id: I8b78c37b5305a28a261a82308bb5bf88c0728fdc
2012-04-10 09:57:40 -07:00
Marc Blank
ea181b0bce Merge "Add various virtual folders" 2012-04-10 09:31:49 -07:00
Marc Blank
3a4448facc Add various virtual folders
* Added a starred folder for each account (only shows up if there
  are any starred messages)
* Added a combined starred folder in the "combined" account
* Use proper icon for the starred folders
* Set proper counts for these folders

TODO: There are probably a bunch of loose ends related to how the
counts in these virtual folders get updated

Change-Id: I72fcf543716583bdfcbdd50ffcac3b023a9b59e6
2012-04-10 09:26:09 -07:00