Commit Graph

7348 Commits

Author SHA1 Message Date
Marc Blank
3408ad1113 Use proper column in loadAttachmentCallback
Bug: 6138389

Change-Id: Icd9b3454670d29e1fbd1dfc309700eb1643cc9ee
2012-03-08 21:18:04 -08:00
Marc Blank
ddca5c8848 Add permission for attachment reading
Change-Id: I50224b5feb6772700a673bd20c27c8711d09d59f
2012-03-08 20:04:17 -08:00
Marc Blank
97e4651c45 Repair brain damage
Change-Id: I1f2367476f78c5cd78d8a59e099debabceb95e3a
2012-03-08 19:48:11 -08:00
Marc Blank
c3643cf2b5 Fix search to work with IMAP
Change-Id: Ic3d9dfec0e30323e258e59630c2ca42bb1c7e98c
2012-03-08 17:23:49 -08:00
Marc Blank
26195ef64d Handle searchUri (first pass)
Change-Id: I75f7a757322e1d4f9b4eac92b9ecbb6a0cc6580b
2012-03-08 15:14:48 -08:00
Marc Blank
e1195f97d2 Merge "Fix up delete to handle trash/drafts deletions" 2012-03-08 15:12:06 -08:00
Marc Blank
06a382f26f Fix up delete to handle trash/drafts deletions
* Also, while we're here, create default "last touched time" for drafts and
  sent so that they appear in the initial recent list

Change-Id: Ie2fe20b34625b5616dac5581f9bbd015f52a82bc
2012-03-08 14:36:26 -08:00
Eric Fischer
194338f915 Merge "Import translations. DO NOT MERGE" 2012-03-08 11:10:33 -08:00
Eric Fischer
af99847e39 Import translations. DO NOT MERGE
Change-Id: I11d56ddc18a2a49ebfb47bc51959c285df7076bc
2012-03-08 11:08:54 -08:00
Mindy Pereira
64192ef8e8 Merge "Connect search activities for email2." 2012-03-08 10:37:30 -08:00
Mindy Pereira
d27eed969b Connect search activities for email2.
Change-Id: I9462e2a99dc9c37b7a14b9bcc4e3b44c227c131f
2012-03-08 10:17:55 -08:00
Marc Blank
92f9de3c5c Merge "Return searchUri with accounts; return empty cursor for now" 2012-03-08 08:21:54 -08:00
Marc Blank
ef94d9285e Return searchUri with accounts; return empty cursor for now
Change-Id: I160676a492ef359007676c3aa9f56f9015b64c64
2012-03-08 08:17:52 -08:00
Brian Muramatsu
6b4cdee94f am 938ec79a: am d163332b: am d5fdf404: Merge "Fix STARTTLS handshake error in Email\'s SmtpSender class"
* commit '938ec79ac92ef9119ad75b49691b2121886d867b':
  Fix STARTTLS handshake error in Email's SmtpSender class
2012-03-07 17:22:07 -08:00
Marc Blank
420e97f0f8 Support attachment commands from UIProvider
Change-Id: Ib457808bdb424275c0abe6e1d86e3b9d33406780
2012-03-07 14:57:19 -08:00
Marc Blank
95bc0d0fee Merge "Add columns to Attachment for UIProvider use" 2012-03-07 13:16:55 -08:00
Marc Blank
70bbe5ec3c Add columns to Attachment for UIProvider use
Change-Id: I7f85431f409dbd6a5bd6d111b18d1fc89c00b9b2
2012-03-07 13:10:23 -08:00
Eric Fischer
fc395fbeef Import translations. DO NOT MERGE
Change-Id: If90878326bff24f70a26e6944d763f669d8b36e0
2012-03-07 11:33:24 -08:00
Andy Huang
b4a4ca99a9 Attachment SYNCED column is going away
Change-Id: I19476bc5a9a9e557e61a7347689129ce552b3ff9
2012-03-07 10:29:23 -08:00
Marc Blank
af8f8a48ee Reconcile accounts in deleteAccountPIMData
Change-Id: Ifd17ef76e13ddcfa07c84429dca7bf19e6cbcfab
2012-03-07 08:43:08 -08:00
Brian Muramatsu
938ec79ac9 am d163332b: am d5fdf404: Merge "Fix STARTTLS handshake error in Email\'s SmtpSender class"
* commit 'd163332bc58cb1b2f09fd061e51e50ecbc40eb73':
  Fix STARTTLS handshake error in Email's SmtpSender class
2012-03-07 02:13:25 -08:00
Brian Muramatsu
d163332bc5 am d5fdf404: Merge "Fix STARTTLS handshake error in Email\'s SmtpSender class"
* commit 'd5fdf40490033bbafbd946e92094b18e931c1a76':
  Fix STARTTLS handshake error in Email's SmtpSender class
2012-03-07 02:09:18 -08:00
Brian Muramatsu
d5fdf40490 Merge "Fix STARTTLS handshake error in Email's SmtpSender class" 2012-03-06 17:26:04 -08:00
Andy Huang
cbebb35426 fix double-spinners in action bar
fix per mindyp

Change-Id: I3d05073938a148c39e4e3a3ff71df0366c166bff
2012-03-06 16:59:15 -08:00
Andy Huang
0ee2a3ccee Fix conversation view problems in Email2
The JavaScript in the assets/ dir wasn't inherited from
UnifiedEmail, and UnifiedEmail's ProGuard flags were being
ignored.

Also refactor a bit of the makefile.

Change-Id: Ic3de41f3eb1882831d61b8ae34e4dd298660acdb
2012-03-06 16:36:38 -08:00
Eric Fischer
98ea0bd9fb Import translations. DO NOT MERGE
Change-Id: I65a5571213f308b4e4d5e9b67869c9e9e1d7888e
2012-03-06 11:14:37 -08:00
Mindy Pereira
53bbe02cc9 Remove second launcher.
Change-Id: Ifdf4bf6722fd6b94e24e6ee81e94028883404bac
2012-03-06 09:33:49 -08:00
Mindy Pereira
71b57354c1 Listen for application/email-ls so we can distinguish between email2/gmail2.
Change-Id: I1b30738b0d8a3f6830dfc6d67b6db385771bba15
2012-03-06 08:47:52 -08:00
Mindy Pereira
6ae4b080d4 Set compose to email2 until we get rid of the email app.
Email2 supports the compose intent.

Change-Id: I739ccb95b63806ed46dfa74b721b5a43665aa1c4
2012-03-06 08:24:22 -08:00
Mindy Pereira
a4abf7e944 Create shim activity for showing conv/ convlist from widget
Change-Id: Ifb0fd8e8c2d32dd52cfdc641fc973f085515bb54
2012-03-05 18:06:19 -08:00
Mindy Pereira
70470c9a01 Add widget to email2.
Change-Id: I66bbee2bc5317837d625b1acc037b75056cfc277
2012-03-05 17:26:57 -08:00
Paul Westbrook
27282ed34a Change the authority for Email2's account cache provider
Allow the account cache cursor to have the notification uri set

Change-Id: I8b01ada0b787fe7a709ad7feacacb91acc3da826
2012-03-05 16:21:14 -08:00
Eric Fischer
08c6aabf06 Import translations. DO NOT MERGE
Change-Id: Ia0d47022963e6ea8b984b5460f21d4bf565ecf3f
2012-03-05 12:42:41 -08:00
Marc Blank
bc7f451442 Fix IMAP/POP notifications
* Make sure the default Inbox is always notified
* Use correct "new" count for mailbox

Change-Id: Id66c76e415589f6eb6fdad0649ae039fd45c1205
2012-03-05 10:23:38 -08:00
Marc Blank
54c26f9d32 Improve hashCode() for Address
Change-Id: Ifa15e57d8b7ff83511aab853dc0a5da1eb14892d
2012-03-04 17:31:38 -08:00
Marc Blank
0ba6b91842 Give Address a hashCode() method
Bug: 1858468

Change-Id: Ic91292c7ab7cf8b42cdecd54fa2d4faf91b2ff4d
2012-03-02 15:18:57 -08:00
Marc Blank
258ab6ee84 Prevent NPE in AccountCheckSettings
Bug: 5911793
Change-Id: I2834ab6d139e734baed6790098f0405e6a4e957a
2012-03-02 12:41:01 -08:00
Eric Fischer
0888b50158 Merge "Import translations. DO NOT MERGE" 2012-03-02 11:47:10 -08:00
Eric Fischer
504f3df8c4 Import translations. DO NOT MERGE
Change-Id: Ia048fa5a05d849c742d634b42972cb966f57f3d3
2012-03-02 11:33:43 -08:00
Marc Blank
e1a6088ee4 Don't try to refresh combined inbox
Bug: 6022440
Change-Id: I182c0da80debff5579b850c20015253864a0cf9f
2012-03-02 10:31:11 -08:00
Marc Blank
cdd4e8b6ca Merge "Hook up attachment queries; use more specific notifications" 2012-03-02 09:28:54 -08:00
Marc Blank
eccf7ee9a4 Hook up attachment queries; use more specific notifications
Change-Id: I01198b9ddf63e1edd9a35a81c15e0cf791702184
2012-03-02 09:16:26 -08:00
Paul Westbrook
f500ce4489 Merge "Change usage of AccountCacheProvider" 2012-03-01 16:24:22 -08:00
Paul Westbrook
39b028fb4d Change usage of AccountCacheProvider
Change-Id: I3e2f14d5ee0f69c7c3527e7a511d84f9efed2df7
2012-03-01 15:42:31 -08:00
Marc Blank
ceedaa3c54 Fix settingsQueryUri
Change-Id: I519f9e52ebe6a2eeeed78913e0f2b0c01539161e
2012-03-01 13:24:58 -08:00
Marc Blank
d5187106d1 Handle account settings query in EmailProvider
Change-Id: Iae33b00c3fa17fe381c0c66d9e159a2717e0f201
2012-03-01 11:36:15 -08:00
Marc Blank
c7a10613b3 Clean up updated messages in non-syncing mailboxes
* We'll just delete the updates for that mailbox

Change-Id: I6eec384334c9b1ea42ec064a49f938c772c44489
2012-02-29 16:50:14 -08:00
Misha Nasledov
c31e2555bf Fix STARTTLS handshake error in Email's SmtpSender class
The Email.apk checks for "-STARTTLS" in the SMTP server's EHLO response
but SMTP servers may respond with STARTTLS on the last line as such:

250 STARTTLS

Or even as part of a line as such:

250-XSECURITY=NONE,STARTTLS

Checking for "-STARTTLS" in this case will break. The fix is to simply check
for "STARTTLS" instead.

See http://code.google.com/p/android/issues/detail?id=19109
And http://code.google.com/p/android/issues/detail?id=2309

Change-Id: I3a590a4398cb664f46875650550986a67f320f76
2012-02-29 03:15:10 -08:00
Paul Westbrook
108f7b639a Support the always_show_images column
Change-Id: I4817ca936cc2775cd22b878d17045e0ede0af04d
2012-02-28 16:19:37 -08:00
Marc Blank
b019a5a33d Fix manifest to look for send for composing a message.
Change-Id: Ic57240a7ca28a290ab4555c3477dc79f1546b3b6
2012-02-28 13:52:18 -08:00