Commit Graph

4880 Commits

Author SHA1 Message Date
Andy Stadler
15d338deb6 am 4c6f8b55: (-s ours) am 8252c305: (-s ours) am 07a85746: Merge "DO NOT MERGE - Prevent NPE when account sender name is null" into gingerbread
* commit '4c6f8b55bb2fc308623e0b820c36b7015f37e643':
  DO NOT MERGE - Prevent NPE when account sender name is null
2011-03-30 16:41:21 -07:00
Andy Stadler
c8d181602c am 7bead5e3: (-s ours) am 3f8c081d: (-s ours) am aba60dfb: Merge "DO NOT MERGE - Fix NPE when trying to open attachments" into gingerbread
* commit '7bead5e3b8ebf1305ebd44b31b492fb8dd2ee49b':
  DO NOT MERGE - Fix NPE when trying to open attachments
2011-03-30 16:41:19 -07:00
Andy Stadler
b40375195d am b9e46a68: (-s ours) am 4fed8653: (-s ours) am 064c1870: Merge "DO NOT MERGE - Fix NPE in pop3 checkcapabilities" into gingerbread
* commit 'b9e46a68601a7b35a6d0377d44142627c8708cd8':
  DO NOT MERGE - Fix NPE in pop3 checkcapabilities
2011-03-30 16:41:13 -07:00
Andy Stadler
5e0e67adb9 am 7b62ac18: (-s ours) am 07eb4bdc: (-s ours) am 8f0a79c2: DO NOT MERGE - Add 55 roadrunner email setups
* commit '7b62ac184598bba04bea984fea1a26ae2e4ae5f9':
  DO NOT MERGE - Add 55 roadrunner email setups
2011-03-30 16:41:07 -07:00
Andy Stadler
4c6f8b55bb am 8252c305: (-s ours) am 07a85746: Merge "DO NOT MERGE - Prevent NPE when account sender name is null" into gingerbread
* commit '8252c305993f9a1e78307be989f3947c16c44617':
  DO NOT MERGE - Prevent NPE when account sender name is null
2011-03-30 15:30:15 -07:00
Andy Stadler
7bead5e3b8 am 3f8c081d: (-s ours) am aba60dfb: Merge "DO NOT MERGE - Fix NPE when trying to open attachments" into gingerbread
* commit '3f8c081d2b985915dd6585f4ef13d964bf8580c2':
  DO NOT MERGE - Fix NPE when trying to open attachments
2011-03-30 15:30:13 -07:00
Andy Stadler
b9e46a6860 am 4fed8653: (-s ours) am 064c1870: Merge "DO NOT MERGE - Fix NPE in pop3 checkcapabilities" into gingerbread
* commit '4fed865309b1f601e61ece38caa3fd4c622eb928':
  DO NOT MERGE - Fix NPE in pop3 checkcapabilities
2011-03-30 15:30:11 -07:00
Andy Stadler
7b62ac1845 am 07eb4bdc: (-s ours) am 8f0a79c2: DO NOT MERGE - Add 55 roadrunner email setups
* commit '07eb4bdc018888e018163da901a54dd15f65671c':
  DO NOT MERGE - Add 55 roadrunner email setups
2011-03-30 15:30:07 -07:00
Todd Kennedy
aaec6a9a2b Merge "Disallow editing username after account creation" 2011-03-30 14:47:28 -07:00
Justin Ho
b7f2daace9 am e5705c53: (-s ours) am e55458fa: Merge "DO NOT MERGE Don\'t duplicate HTML in reply / forward" into honeycomb-mr1
* commit 'e5705c53aeb0041c4e832c3882de3a338302779a':
  DO NOT MERGE Don't duplicate HTML in reply / forward
2011-03-30 09:57:36 -07:00
Andy Stadler
8252c30599 am 07a85746: Merge "DO NOT MERGE - Prevent NPE when account sender name is null" into gingerbread
* commit '07a85746afecd4267de1fb17f3670b79e06a15f2':
  DO NOT MERGE - Prevent NPE when account sender name is null
2011-03-30 09:31:08 -07:00
Andy Stadler
3f8c081d2b am aba60dfb: Merge "DO NOT MERGE - Fix NPE when trying to open attachments" into gingerbread
* commit 'aba60dfb73f2e1c8406f64ba04f42d4d9a29dd1f':
  DO NOT MERGE - Fix NPE when trying to open attachments
2011-03-30 09:31:02 -07:00
Andy Stadler
4fed865309 am 064c1870: Merge "DO NOT MERGE - Fix NPE in pop3 checkcapabilities" into gingerbread
* commit '064c1870195a5d53346fd591072cc487083be7b6':
  DO NOT MERGE - Fix NPE in pop3 checkcapabilities
2011-03-30 09:30:59 -07:00
Andy Stadler
07eb4bdc01 am 8f0a79c2: DO NOT MERGE - Add 55 roadrunner email setups
* commit '8f0a79c2ef29b714110ee00a4fc28f97a729d4ef':
  DO NOT MERGE - Add 55 roadrunner email setups
2011-03-30 09:30:50 -07:00
Todd Kennedy
206109cf44 Disallow editing username after account creation
After the account is created, don't allow editing the user name. We want to
prevent this as the user name is core to the account and changing the user
name is tantamount to creating a new account.

bug 3502279

Change-Id: I1d89710fd48aca67ba13abea5bdbdc1d87941618
2011-03-30 08:54:34 -07:00
Eric Fischer
68058c1437 am fa2047aa: (-s ours) am 936eb17e: am caf358ed: (-s ours) Import revised translations. DO NOT MERGE
* commit 'fa2047aacf2f27ae3c343fe23a6cb558456affe5':
  Import revised translations.  DO NOT MERGE
2011-03-29 16:59:39 -07:00
Justin Ho
e5705c53ae am e55458fa: Merge "DO NOT MERGE Don\'t duplicate HTML in reply / forward" into honeycomb-mr1
* commit 'e55458fa4dcb27e686a9b5d37727c45fb8552875':
  DO NOT MERGE Don't duplicate HTML in reply / forward
2011-03-29 15:35:13 -07:00
Todd Kennedy
e369f2772c Merge "Allow globals in the providers.xml" 2011-03-29 15:28:13 -07:00
Justin Ho
e55458fa4d Merge "DO NOT MERGE Don't duplicate HTML in reply / forward" into honeycomb-mr1 2011-03-29 15:16:00 -07:00
Makoto Onuki
c6973440fc Merge "First path of MessageList cleaning up" 2011-03-29 14:42:19 -07:00
Eric Fischer
fa2047aacf am 936eb17e: am caf358ed: (-s ours) Import revised translations. DO NOT MERGE
* commit '936eb17e5ced0edeb89e9b7da75b559a8a4e4fbf':
  Import revised translations.  DO NOT MERGE
2011-03-29 14:19:57 -07:00
Eric Fischer
936eb17e5c am caf358ed: (-s ours) Import revised translations. DO NOT MERGE
* commit 'caf358ed753e64ce1bc8aeb65cf728aed19f8662':
  Import revised translations.  DO NOT MERGE
2011-03-29 14:07:19 -07:00
Eric Fischer
caf358ed75 Import revised translations. DO NOT MERGE
Change-Id: I4bb7445a1b1e83b2d34dccaea7cbb98e28461bbc
2011-03-29 13:29:51 -07:00
Eric Fischer
ba0730e4b4 am 1b63120a: (-s ours) am 7568aa93: Import revised translations. DO NOT MERGE
* commit '1b63120a3c762a6dccba17ffbd271fb3ab87d6e6':
  Import revised translations.  DO NOT MERGE
2011-03-29 12:28:11 -07:00
Eric Fischer
1b63120a3c am 7568aa93: Import revised translations. DO NOT MERGE
* commit '7568aa936a90e19c5ffb7f7451d6a3804485e52b':
  Import revised translations.  DO NOT MERGE
2011-03-29 12:25:01 -07:00
Eric Fischer
7568aa936a Import revised translations. DO NOT MERGE
Change-Id: I92eab36c38104024c0e885240f705e57303fb617
2011-03-29 11:59:24 -07:00
Todd Kennedy
08534762bd Allow globals in the providers.xml
We now allow a single global character ['*'] to be specified somewhere in
the domain attribute. Additionally, we will replace the string "$domain"
with the matched domain in all attributes -- user name, password and URIs.

bug 4090086

Change-Id: I46a637ed364c1a079e1230fa22393a1bac059b1f
2011-03-29 11:12:13 -07:00
Makoto Onuki
9e53322ee7 First path of MessageList cleaning up
- Menu now works
- Removed a lot of unnecessary/soon-to-be-unnecessary code.
  Especially,
  - multi-selection panel is now replaced with CAB
  - SetTitleTask will be replaced with a loader
- Removed the option menu xml for magic mailboxes
  (The regular one should work for them as well)

Bug 4184142

Change-Id: I52adff6d711232d536b6f00367a240e1faeea14b
2011-03-28 16:36:01 -07:00
Andy Stadler
07a85746af Merge "DO NOT MERGE - Prevent NPE when account sender name is null" into gingerbread 2011-03-25 16:44:05 -07:00
Andy Stadler
aba60dfb73 Merge "DO NOT MERGE - Fix NPE when trying to open attachments" into gingerbread 2011-03-25 16:43:50 -07:00
Andy Stadler
064c187019 Merge "DO NOT MERGE - Fix NPE in pop3 checkcapabilities" into gingerbread 2011-03-25 16:43:42 -07:00
Andy Stadler
9258827315 DO NOT MERGE - Prevent NPE when account sender name is null
Bug: 3500373
Backport of: Id07270f34d9cc0523c46104b3167711b71798623

Change-Id: I23464e3edd9c8d8ecc54451cf7eabfddb73bd745
2011-03-25 16:29:53 -07:00
Andy Stadler
397439881a DO NOT MERGE - Fix NPE when trying to open attachments
The attachment info may be null when we attempt to mark them for
downloading.  Add a null-check before we try to dereference the info
structure.

Bug: 4053184
Backport of: I831e3abd100664c92f7af585014a03250e40ff64

Change-Id: Iffdf8cdc3a17c0ab691596eb9e240ef87acb2e37
2011-03-25 16:11:09 -07:00
Todd Kennedy
5c9be9af18 DO NOT MERGE Don't duplicate HTML in reply / forward
On exchange servers that support "smart reply", the original message is
actually appended by the server. In this situation, we should not append
the original HTML text on the client.

bug 4177192

Change-Id: I0bdb34cf837e0cc0bfac8917f993ecb764814d97
2011-03-25 15:50:04 -07:00
Andy Stadler
0408ee5b94 DO NOT MERGE - Fix NPE in pop3 checkcapabilities
* This happens if an open fails immediately (error message in the
  initial banner) followed by a checkSettings.
* The fix is to harden checkSettings to force a clean connection
  every time.

Bug: 2170147
Backport of: If7403bf517477d2b03b21d71caab511fe45e234c

Change-Id: Ia6cc0e3ab0c8a8a78b5d8b8fb7b8ba4b4cdd3ef2
2011-03-25 15:08:34 -07:00
Andy Stadler
8f0a79c2ef DO NOT MERGE - Add 55 roadrunner email setups
Bug: 4086524
Backport Of: I8d7758d3720e45515abae1d071a8b149ac63a4ce

Change-Id: If5c20e9f8351864a7878a7eef229ab1e0ec850e1
2011-03-25 14:41:25 -07:00
Todd Kennedy
de70ee5f78 Don't duplicate HTML in reply / forward
On exchange servers that support "smart reply", the original message is
actually appended by the server. In this situation, we should not append
the original HTML text on the client.

but 4177192

Change-Id: I6fad74ac761e2abfe7cb0f536df4db30f7d5ca9a
2011-03-25 14:25:48 -07:00
Todd Kennedy
ff9e94e722 am f52697f4: am 99930f81: Don\'t load from the network until specified
* commit 'f52697f42af98a76e61ff388c4ef8f194c8f8538':
  Don't load from the network until specified
2011-03-24 16:20:29 -07:00
Todd Kennedy
f52697f42a am 99930f81: Don\'t load from the network until specified
* commit '99930f81f1b7f1d5b769be958b3d1efe0aeef3fc':
  Don't load from the network until specified
2011-03-24 16:18:40 -07:00
Todd Kennedy
99930f81f1 Don't load from the network until specified
We were always loading from the network for HTML messages. Now we don't
load from the network until the user clicks the "display images" button.

Change-Id: I4cdfea5e5338f3bba70b3d04df6551516d3e1a85
2011-03-24 16:08:57 -07:00
Todd Kennedy
d31238ca88 Add support to query for message IDs
If an IMAP server supports the UIDPLUS capability, it can return the new UID
as part of the response to the "UID COPY" command. However, if the server does
not support UIDPLUS, we perform a SEARCH to try to determine the new message
UID.

This is the second of a couple modifications.

bug 4092301

Change-Id: I1f548b63becfec8733cb8ba9a3fe6ff4be6fdd83
2011-03-24 10:56:42 -07:00
Makoto Onuki
2f0c211786 Merge "Fix NPE in message view" 2011-03-24 10:23:35 -07:00
Makoto Onuki
511d378777 Fix NPE in message view
Message view layout is still unusable with this fix, but it's a start...

Bug 4163869

Change-Id: Ifa88c758b7945b4e58d5ca9f1d618a4402227c7b
2011-03-23 17:24:09 -07:00
Todd Kennedy
1e3a5f3ab1 Don't load from the network until specified
We were always loading from the network for HTML messages. Now we don't
load from the network until the user clicks the "display images" button.

Change-Id: I1838b6cb09d49a2b521baa12a80239107391534f
2011-03-23 16:48:23 -07:00
Makoto Onuki
9f0283dbd7 Merge "Better fix for the PendingIntent issue." 2011-03-23 15:30:51 -07:00
Todd Kennedy
284d8d7db5 Add support for UIDPLUS capability
When copying messages between mailboxes using standard IMAP, we must perform
a QUERY or FETCH in order to determine the new message UID. However, if the
server supports the UIDPLUS capability, the server will return the new UID
as part of the response to the "UID COPY" command.

This is the first of a couple modifications. We still need to fallback to a
less efficient QUERY/FETCH if the server does not support UIDPLUS.

bug 4092301

Change-Id: I9279f7fd70daf85adba3b3e202c12d67ddf91f22
2011-03-23 15:15:45 -07:00
Makoto Onuki
308ce92847 Better fix for the PendingIntent issue.
Refactor the changes introduced in Ib02842bb.

- Now Welcome and AccountSettingsXL accept intents with URLs of the following
style, and get IDs from query params, rather than extras.

Welcome:
content://ui.email.android.com/view/mailbox?ACCOUNT_ID=1&MAILBOX_ID=2&MESSAGE_ID=3

AccountSettingsXL:
content://ui.email.android.com/settings?ACCOUNT_ID=1

- Now the "new message" and "login failed" notifications use these new style
intents, so the system wouldn't merge PendingIntents for different accounts.

Also:
- Moved all notification creation logic to NotificationController.
  (Except the one in CalendarSyncEnabler; which is used only to support
  upgrading from pre-froyo and I don't think it's worth refactoring.)

- Note the "password expired/expiring" and "security needed" notifications
aren't changed; they still use extras to store account IDs.  This is okay
because these notifications are not per-account.

Bug 4065269

Change-Id: I70737438d2e7c45fd7488a5b0a7105c8568e02f7
2011-03-23 14:49:38 -07:00
Makoto Onuki
39745c3dc0 Fix AccountSetupOptions for phone UI
Bug 4157050

Change-Id: I1addca05b9c56266b28e7449c87b3a5010ed671b
2011-03-23 11:17:46 -07:00
Makoto Onuki
ae72ec88ce Compose: Set focus to the To field by default
We initialize the focus with setNewMessageFocus(), but it's only called
from processSourceMessage() (for EDIT_DRAFT) initFromIntent() (for other
actions, except for "new draft").  We didn't intialize the focus for new
drafts.  Let's just get the To field to get the focus by default to
cover this case.

Bug 4048238

Change-Id: I50cd69b8813198c96beab2025576d390520dc6a4
2011-03-22 11:43:12 -07:00
Makoto Onuki
ca64197427 Merge "Improve EmailAsyncTask" 2011-03-21 17:31:48 -07:00