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
Marc Blank
27be3474a2
Actually put composeUri into the cursor; d'oh!
...
Change-Id: I1295bb7501c3481f0d5e21e7cc76c1b19ab3047d
2012-02-28 13:25:10 -08:00
Marc Blank
d9201da55b
Setup composeUri for accounts in EmailProvider
...
* Add intent filter in manifest
Change-Id: Ifbacfcb6109d76d48dabb87eb45ea28ec4278ad8
2012-02-28 10:16:43 -08:00
Marc Blank
8c4b6e40cf
Hook up settingsIntentUri in EmailProvider
...
Change-Id: Icc47a7dd29f6707443f5b56bdc6df86818295662
2012-02-28 09:15:53 -08:00
Marc Blank
fd077592ee
Use EmailProvider to create account list
...
Change-Id: Iedd99ecb95066c3b7e089e3b987a0caed44b97e5
2012-02-27 13:22:45 -08:00
Marc Blank
9a5e2a798e
Fix clearing of mailbox notifications
...
Change-Id: Ieb98a8908ec067229dd449790da55085585ef17b
2012-02-26 12:52:57 -08:00
Marc Blank
bf5caf97c5
Notify by mailbox, rather than account
...
* Update EmailProvider, removing two no-longer-used columns in Account and
Mailbox
Change-Id: Ie0f10eb0ca315d73e82be968f7760a51a239ba3f
2012-02-24 14:51:59 -08:00
Marc Blank
98412cadfb
Use account id instead of name for queries
...
Change-Id: I49f870491d2b090df345b956280dbb477436be60
2012-02-24 10:27:29 -08:00
Mindy Pereira
99dfd1edfd
Merge "Remove folder sync_frequency column. UI doesn't need it."
2012-02-23 13:57:25 -08:00
Mindy Pereira
b61bd298bd
Remove folder sync_frequency column. UI doesn't need it.
...
Change-Id: I2a696115aed048f854174a8c4dc7666165b6ae1f
2012-02-23 13:52:11 -08:00
Marc Blank
272d22d641
Add last sync result definitions to EmailContent
...
Change-Id: I43ea9a9ed3e1982610443887298d54654deb01b8
2012-02-23 10:28:36 -08:00
Marc Blank
9d5996534a
Merge "Send sync status updates from POP3/IMAP"
2012-02-22 16:30:17 -08:00
Marc Blank
87c84a6d96
Send sync status updates from POP3/IMAP
...
Change-Id: Ia1bb5d1a302d6dde8b8979e03a762d6d45ee8cd3
2012-02-22 16:27:26 -08:00
Paul Westbrook
69e37ad2a2
Use existing intent filter for editing settings
...
Change-Id: Ief365ba8046cd987f3afeb3736d7200eeec29d77
2012-02-22 14:50:33 -08:00
Paul Westbrook
c2412dfec4
Support for new settings intent
...
Change-Id: I0d5a1f8e6f90885464bcd348a1fae1a3b7db415a
2012-02-22 13:31:03 -08:00
Marc Blank
6b9d94bf39
Make mailbox change notifier less noisy
...
Change-Id: I6eb7ac4f60acf6d92f4c094a373038fef222d97a
2012-02-22 12:59:49 -08:00
Marc Blank
81567d7a51
Merge "Support syncStatus and lastSyncResult in EmailProvider"
2012-02-22 11:59:51 -08:00
Marc Blank
1dc7772d43
Support syncStatus and lastSyncResult in EmailProvider
...
* Also, trigger a sync on refreshUri
Change-Id: Ia8dee593decfc2101873071ad64fcc3fd1fd5f23
2012-02-22 11:50:18 -08:00
Eric Fischer
1d5cac2414
Import translations. DO NOT MERGE
...
Change-Id: I12e853250f5b0f27e1b7c4bd84f4e76c51b914d1
2012-02-22 11:34:52 -08:00
Marc Blank
fdf84f35bc
Merge "Fix build break; support folder query"
2012-02-21 17:33:16 -08:00
Marc Blank
7db23e6acb
Fix build break; support folder query
...
Change-Id: Ic2a62e2d00e0fe46a1a488d665818c47243c9d8d
2012-02-21 17:30:34 -08:00