Commit Graph

4894 Commits

Author SHA1 Message Date
Makoto Onuki
acef8061ff Merge "More use of EmailAsyncTask" 2011-03-31 14:30:16 -07:00
Todd Kennedy
5e4f1c3872 Allow globals in the providers.xml
There are two ways globals can be specified. There can be only one global
character ['*'] and/or multiple wildcard characters ['?']. The global
will match zero or more characters. The wildcard will match any character.

bug 4090086

Change-Id: I07e3edebd1fe989094c68cf047ce5bc9fb91aba0
2011-03-31 14:28:43 -07:00
Marc Blank
566c4f9117 Merge "Highlight utility for HTML and text" 2011-03-31 14:07:50 -07:00
Marc Blank
76f614720d Highlight utility for HTML and text
* Add utilities for adding highlighting markup to HTML and
  highlighting spans to plain text (for Webview and UI,
  respectively)
* Rename Snippet.java to TextUtilities.java and move to utility
  package

Change-Id: Ic443ab5ce9c0199fa82a68e1592bf259494cadd2
2011-03-31 13:49:52 -07:00
Makoto Onuki
44f45f4221 Merge "Don't use findViewById (part 1 -- account setup)" 2011-03-31 11:06:15 -07:00
Makoto Onuki
af6079c823 More use of EmailAsyncTask
... for Welcome and EmailWidget.  So that now it's safe for onDestroy()
to be called while a task is running.  (onDestroy cancels it.)

Change-Id: I660b471465170e1d1d0ce153571fb924ae703d7d
2011-03-31 11:05:22 -07:00
Gilles Debunne
f2bcb222ca Merge "Unused assets removed from Email" 2011-03-30 18:07:54 -07:00
Andy Stadler
6c5106181b am 28107dda: (-s ours) am 2daecc7a: (-s ours) am dc43877b: Merge "DO NOT MERGE - Don\'t sync messages moved from the sent folder" into gingerbread
* commit '28107ddadf7c3cd8c1b120c1655e061ae6176f37':
  DO NOT MERGE - Don't sync messages moved from the sent folder
2011-03-30 16:41:23 -07:00
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
28107ddadf am 2daecc7a: (-s ours) am dc43877b: Merge "DO NOT MERGE - Don\'t sync messages moved from the sent folder" into gingerbread
* commit '2daecc7a54d55177835ab9cfc5a4fde589f35f03':
  DO NOT MERGE - Don't sync messages moved from the sent folder
2011-03-30 15:30:17 -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
Makoto Onuki
2fbb3db5d8 Don't use findViewById (part 1 -- account setup)
Added two new functions:
- UiUtilities.getView()
  is a fail-fast version of findViewById().  Crashes when there's no view
- setVisibilitySafe()
  same as View.setVisibility, but doesn't crash even if a view doesn't exist

Let's try to avoid the use of findViewById(), and instead use getView(), *right
after* the layout is inflated, so that we'll always fail-fast if a layout
doesn't have a required view.  (Rather than getting a NPE only when the view
is really accessed, which can be in a code path which is rarely executed--e.g.
only when there's a protocol error.)

Let's only use findViewById() only when we're sure no all the variants of a
layout have the view in question and leave a comment to make it clear it's on
purpose.

(UiUtilities has been moved from com.android.email to
com.android.email.activity)

Change-Id: I36e0bab65a989f5d34cf636f13e1eaee084547af
2011-03-30 13:47:13 -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
2daecc7a54 am dc43877b: Merge "DO NOT MERGE - Don\'t sync messages moved from the sent folder" into gingerbread
* commit 'dc43877b3875eb7e39e7508bf4009c8bf711d548':
  DO NOT MERGE - Don't sync messages moved from the sent folder
2011-03-30 09:31:13 -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
Gilles Debunne
8c74176522 Unused assets removed from Email
Change-Id: I485752fac0c25262edde416f132482600eb32013
2011-03-28 14:44:03 -07:00
Andy Stadler
dc43877b38 Merge "DO NOT MERGE - Don't sync messages moved from the sent folder" into gingerbread 2011-03-25 17:25:41 -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
2ac4f855ea DO NOT MERGE - Don't sync messages moved from the sent folder
Modified location of the test to processUploadMessage() method. We do this to
prevent creating multiple EmailContent.Message objects.

Bug: 4096266
Backport from: Id83d3703283c0cd89a60c6210976093d39fb6934

Change-Id: Ie0e9c52182df96617cc942235135ef5ccf865d41
2011-03-25 16:36:11 -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