Commit Graph

2793 Commits

Author SHA1 Message Date
Todd Kennedy
a50fc99b0c Use Account instead of URI to create transports
There's no need to create a URI just to rip in appart again. Additionally, to
support additional changes (i.e. to use Mailbox instead of Folder in the
MessageController), we need to store the actual Account.

NOTE -- This change only affects IMAP and POP3. SMTP will come in a follow-on CL

Change-Id: I400036a17271c99272fd9c603547dcd713b50b9d
2011-04-20 08:31:24 -07:00
Ben Komalo
8f84cae3c3 Merge "Re-work the layout computation for MessageListItem" 2011-04-19 12:19:42 -07:00
Ben Komalo
8b2109f047 Re-work the layout computation for MessageListItem
This now uses an XML layout that gets inflated and computed after a
layout pass. The drawing simply uses the coordinates stored after the
layout.

This makes it a lot easier to maintain the different views and allows us
to simply provide different XML files for different modes/views, isntead
of trying to hand tweak Java layout code.

Some TODOs - clean up the "paints" and optimize the layout/drawing
computation

Change-Id: I784919f726bd4d80aba8744a8f047fcfe79ad93a
2011-04-19 11:53:30 -07:00
Todd Kennedy
ba7652cda0 Make ImapFolder a top-level class
No code changes; just moving the class

Change-Id: I4e4544d99d52dde85b96c99ef45da3a96e7d3d48
2011-04-19 09:31:43 -07:00
Ben Komalo
36990d46cf Fixup auto advance policy handling.
The phone code has gone stale and ignored auto advance policies - this
fixes it, though that code is likely to get merged anyways.

Makes it so that auto-advancing to the end of the list pops back out to
the message list

Bug: 4302999
Change-Id: I609747c0a19672b8aa56d2c0ab57533823899e47
2011-04-18 09:48:58 -07:00
Todd Kennedy
cfbf1eb66d Clean up drag-and-drop
Basic refactoring of the drag-and-drop logic to make it a bit cleaner

Change-Id: I0e59074710be00bd285f637e92f554c8ee47fabf
2011-04-15 14:33:25 -07:00
Todd Kennedy
d1b1404d76 Merge "Implement drag-n-drop with nested folders" 2011-04-15 08:57:26 -07:00
Todd Kennedy
6c3cd4e247 Implement drag-n-drop with nested folders
We can now drill down into nested folders during drag-n-drop. Simply hover over
a collapsed folder for 750ms and it will auto-expand.

Change-Id: Ia9b42dd87e19c2ebdf8675c761cb1453bb26d158
2011-04-14 16:23:20 -07:00
Ben Komalo
8a05da7c8c Remove uneeded layer of parcelling.
ListStateSaver did nothing more than hold a Parcelable, and was a
Parcelable itself. The abstraction may have been useful at some point,
but that time seems to have passed.

Change-Id: I2f1f45828782ab44aa8935aa50b825e07845a2a5
2011-04-14 15:30:54 -07:00
Ben Komalo
28b3fec5c1 Include guava in Email.
- adds a compile time dependency to the guava library
- changes to use @VisibleForTesting in places to ensure it works

Change-Id: I2c5c4f9861234fec3613da011185e5c11f228466
2011-04-14 13:49:01 -07:00
Todd Kennedy
7219fccc42 Always display subfolder icon in the same view
We were handling the subfolder icon strangely. Sometimes it was shown in the
folder_icon view and sometimes in the folder_expanded_icon view. Now the
folder_icon view is used exclusively for system folders (such as inbox, etc...)
and folder_expanded_icon is always used for the expanded/collapsed icon.

Change-Id: Ifff9a44cc792497a469c2408337dafd431f6dfc3
2011-04-14 10:12:18 -07:00
Ben Komalo
5b84c8d9d0 Merge "Apply auto-advance policy when doing a batch op." 2011-04-13 18:04:25 -07:00
Ben Komalo
52618afa81 Apply auto-advance policy when doing a batch op.
Batch operations that occur when the current message selection is
contained within the affected messages will now force the selection to
advance according to the auto advance policy to the next unselected
conversation.

Bug: 3409809
Bug: 3405864
Change-Id: Ibe75f32b9263ef6f3fb2314a07e63980f437f988
2011-04-13 18:03:48 -07:00
Ben Komalo
2071bde957 Merge "Minor fix to error dialog formatting." 2011-04-13 16:13:54 -07:00
Ben Komalo
5a2d7da136 Minor fix to error dialog formatting.
Bug: 3515558
Change-Id: Id4d88379dc68c114338fdd2d4d437a2defb94ba4
2011-04-13 16:07:50 -07:00
Todd Kennedy
a8ba5e76dc Merge "only allow navigating to mailboxes w/ children" 2011-04-13 14:56:16 -07:00
Todd Kennedy
f7036b7379 only allow navigating to mailboxes w/ children
If a mailbox doesn't have any sub-mailboxes, only allow selecting them to view
any contained messages. Do not update the mailbox list.

Change-Id: I6f469bf20a57dc440885402084c21ff184f13dff
2011-04-13 14:35:03 -07:00
Ben Komalo
6336a5231e Remove a layer of public methods that weren't used
Change-Id: Iba88634db2a687ce72f6875e0b499f79c219ca8f
2011-04-13 13:03:23 -07:00
Ben Komalo
1d1b7a070a Merge "Add signature when starting from external intents." 2011-04-13 10:22:51 -07:00
Todd Kennedy
ce99dd8cd1 Add comment to package-private members & methods
Change-Id: I9bb641d44253635f8dacc5dfecde55eac8d72c59
2011-04-13 09:52:42 -07:00
Ben Komalo
0fb68c8f0c Add signature when starting from external intents.
Also update some of the tests.

Bug: 3122070
Change-Id: Ia0e4620f54279dc53ca1c4484fec6508c411b418
2011-04-12 18:10:05 -07:00
Todd Kennedy
2b82c3f0a3 Add columns to cursor to allow for proper layout
The layout requires different indentation. Although the exact layout may
change, we will likely always need to differentiate between the different
mailbox types.

Change-Id: Ia2ff84b552873f92fa45563b2dc0868c29bec3e3
2011-04-12 15:09:51 -07:00
Todd Kennedy
57dc03acec Merge "Add current nested folder to list" 2011-04-12 15:08:00 -07:00
Makoto Onuki
0efbee2bd0 Merge "Fix bug that prevents from accepting 2 invites in a row." 2011-04-12 13:56:59 -07:00
Makoto Onuki
5dceaa5b5e Fix bug that prevents from accepting 2 invites in a row.
mPreviousMeetingResponse is tied to the current response state, so it
should be reset too when we clear the response checkboxes.

Bug 4132763

Change-Id: If816706f47f8500441330882fb4f372b31465ff5
2011-04-12 11:08:16 -07:00
Todd Kennedy
7f139f14b9 Add current nested folder to list
When selecting a nested folder, the currently selected folder should be listed
along with "All Folders" and sub-folders

Change-Id: I7c6f726a0355a13d3e7b59aa4707bd92473283b4
2011-04-12 09:47:56 -07:00
Ben Komalo
7dc1e86d91 Less aggressive selection change in msg content.
All focus changes to the message body content was pushing the selection
to the end, which is wrong if state restoration happens, and is just
non-standard behavior if the user explicitly taps on a particular spot
on the text view. Make this slightly less aggressive.

Misc other changes in compose view.

Bug: 3076256
Change-Id: I9edb9c3c4edb5ddec12207f4136f3ca73cabf89d
2011-04-12 09:23:40 -07:00
Ben Komalo
2577842269 Misc fixes and dead code removal.
Change-Id: I48b2fa5f7bf619197d882c71e8b174d31d130e26
2011-04-11 14:01:01 -07:00
Marc Blank
cd5da3c445 Remember to clear query in MessagesAdapter if we're not searching
Change-Id: I3b16f080c66f6ce025e41a7c459aa3cb94dbecd0
2011-04-08 14:01:35 -07:00
Marc Blank
18d3b3de1e Merge "Improve temporary mailbox settings UI" 2011-04-07 20:04:18 -07:00
Marc Blank
f047c7cfd1 Improve temporary mailbox settings UI
* Start dialogs with current setting selected
* Add Cancel/OK buttons

Change-Id: Ia3d28eec558a8af8d3826b70cb313b68a5efc533
2011-04-07 20:03:23 -07:00
Joe Onorato
7af1ad3b58 Remove the deprecated things from Config.java. These havent been working since before 1.0.
Change-Id: Iea671dc01ff45f1009f6fbb22cf7259e0fc1d4f1
2011-04-07 18:41:11 -07:00
Todd Kennedy
df3133bf3d Merge "Always use the same loader id" 2011-04-07 15:03:59 -07:00
Marc Blank
983a624549 Merge "Temporary UI for setting mailbox sync frequency/lookback" 2011-04-07 14:53:48 -07:00
Marc Blank
d4a1500ae9 Temporary UI for setting mailbox sync frequency/lookback
* Just in MessageListXL for now, as with search
* This allows us to test functionality within EAS, and confirm that
  it's all working w/ unbundled Exchange (API 1)

Change-Id: I4f062ae871a28d2b57a23a269d6ec65903181d26
2011-04-07 14:53:08 -07:00
Todd Kennedy
5965b23909 Always use the same loader id
There's no need to use a different loader ID for each mailbox. Just use
one loader ID to keep things simple.

Change-Id: I46cf0a9ad48c8e0badf72ee73e2d5edadda66912
2011-04-07 14:48:21 -07:00
Todd Kennedy
c5ea3f522a Using the wrong selection for Exchange accounts
Exchange accounts support nested folders, so, we need to use the selection
that excludes any mailboxes with IDs greater than 0. Otherwise, we see all
mailboxes on the account.

Change-Id: If8c2085458176e8bd87013e3b598bd7740c652b2
2011-04-07 14:42:39 -07:00
Todd Kennedy
007d0be4ed First pass at nested folder support
currently only really works for exchange accounts. legacy accounts (imap
or pop) do not build a folder heirarchy.

Change-Id: Idb7c622b64a599a0776233a076359869f4ab4a4f
2011-04-07 14:23:21 -07:00
Marc Blank
fc0f42d6dc Merge "Temporary search UI" 2011-04-06 15:53:09 -07:00
Marc Blank
78684ccc79 Temporary search UI
Change-Id: Ia138ca93f0b28fd0915aa79c965f752f7c08ee90
2011-04-06 08:51:14 -07:00
Makoto Onuki
96332096ca Fix message view for phone
- All layouts are still temporary, but at least they're usable now.
- Removed reply/forward button from the bottom panel.
  There're buttons in the layout.
- Switched to getView().
- removed the unnecessary LinearLayout from the xlarge layout.
- removed some backgrounds that'll probably not be used.

Change-Id: I3aa27c63ab139ae30e5714ac3d9a1eadce74b0e8
2011-04-05 19:20:41 -07:00
Makoto Onuki
e553c6ec0b Merge "Store UUIDs in account shortcuts, rather than IDs." 2011-04-05 10:41:25 -07:00
Makoto Onuki
0b6cb1c330 Store UUIDs in account shortcuts, rather than IDs.
Bug 4192836

Change-Id: I1d6349ed3ad70867f113b9a9f7eb8717b88b24c1
2011-04-04 14:12:05 -07:00
Marc Blank
3d1bb65eec Merge "Add searchMessages command to EmailService" 2011-04-04 11:29:31 -07:00
Marc Blank
c60b8d0529 Add searchMessages command to EmailService
* Also, document service methods in EmailServiceProxy

Change-Id: I46cc68c8c2aa870ea82474c70d944640bb66b0ef
2011-04-04 11:28:25 -07:00
Todd Kennedy
22f06c371b Merge "Define roles for fragment manager and activity" 2011-04-04 10:50:19 -07:00
Makoto Onuki
bd5933d4a1 Merge "Clean up MessageCompose for phone" 2011-04-04 09:56:00 -07:00
Makoto Onuki
449b4d106f Merge "Changed text color for phone" 2011-04-04 09:55:47 -07:00
Todd Kennedy
2d76cca19a Define roles for fragment manager and activity
The roles between MessageListXLFragmentManager and MessageListXL was confusing
and not well defined. Now, the activity (MessageListXL) is responsible for
managing the application "chrome" (such as the action bar) and
MessageListXLFragmentManager is responsible for managing the content area.

Change-Id: I9a36d962bae5263f17fc7dccf133a6711229821c
2011-04-04 09:46:54 -07:00
Todd Kennedy
ae5806ab3a Merge "Update method parameters" 2011-04-04 08:24:57 -07:00
Makoto Onuki
2d380e4504 Clean up MessageCompose for phone
- +cc/bcc and "add attachment" are now menu options.
- layout clean up
- switch to getView()

Change-Id: I5efb6d0fd7b6d1265fed0173463adce2c6d652ba
2011-04-01 15:37:10 -07:00
Todd Kennedy
c33054f9e4 Merge "use non-deprecated async task method" 2011-04-01 12:00:05 -07:00
Todd Kennedy
ef844d86f1 Update method parameters
Only pass along the things we need. For the message dialog, we were passing
in an Activity that was not needed. In the ActivityHelper, we were passing
in an Activity when all we needed was a Context.

Change-Id: I9a93ae07ff2bbdce9466c7e991410c87fb610673
2011-04-01 11:57:52 -07:00
Todd Kennedy
ad7dc464db update mailbox adapter callback
the callback method name was not appropriate in all situations. This has been
renamed to just "onBind()" and will still be invoked whenever data is bound to
the adapter. also, create an empty callback that can be used if the adapter
doesn't need to be informed when a bind occurs.

Change-Id: Ifaa4aea3a59734557651270330ca9439e3ea4ab4
2011-04-01 11:47:35 -07:00
Todd Kennedy
629b93d67d use non-deprecated async task method
Change-Id: I7c798542b478c0d3817bb3dde243da402d4236c4
2011-04-01 11:27:28 -07:00
Todd Kennedy
b9ca15982b Merge "Create separate adapters for mailbox lists" 2011-04-01 10:56:20 -07:00
Makoto Onuki
18f98261a4 Changed text color for phone
... assuming we're going to use the holo light on the phone as well.

Now the text on MailboxList is clearly visible.

Also updated/added some comments.

Change-Id: I280db2b82cbd1627c78a305dd31bbf1b1bb34d1d
2011-03-31 17:29:11 -07:00
Makoto Onuki
a10c709873 Merge "MessageList rework for phone." 2011-03-31 17:28:52 -07:00
Todd Kennedy
74bf57cfaf Create separate adapters for mailbox lists
There are currently two places where we use a mailbox list -- in the main
view and in the "move to" dialog. We've replaced the single, modally
configured adapter with two specialized subclasses.

Change-Id: I5dfd5ccd435fefbab4b7647c2bd7a14818f73bf3
2011-03-31 15:27:12 -07:00
Makoto Onuki
acef8061ff Merge "More use of EmailAsyncTask" 2011-03-31 14:30:16 -07:00
Makoto Onuki
26cfb38042 MessageList rework for phone.
Change-Id: I1cc86c0282f0f3cbe9b78ed97ab3fb8f8d1e7c0f
2011-03-31 14:28:46 -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
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
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
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
Todd Kennedy
e369f2772c Merge "Allow globals in the providers.xml" 2011-03-29 15:28:13 -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
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
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
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
Makoto Onuki
d72f7bdf11 Improve EmailAsyncTask
Added 6 methods:
- execute{Parallel,Serial}
- cancelPreviousAndExecute{Parallel,Serial}
- runAsyncParallel{Parallel,Serial} (replacement for Utility.runAsync)

Bug 4083415

Change-Id: I5ca33000e52fc5265ccc84a6e5acb0d3359d0eb4
2011-03-21 16:41:08 -07:00
Todd Kennedy
a3bc8a2a9f Merge "Don't sync messages moved from the sent folder" 2011-03-21 16:41:00 -07:00
Todd Kennedy
9134916c39 Make method forceLoadSettings() private
Change-Id: Idc36fa205046d19f9a6a9c92c10a9a6f637f1663
2011-03-21 16:18:03 -07:00
Todd Kennedy
c17e9ce85f 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

Change-Id: Id83d3703283c0cd89a60c6210976093d39fb6934
2011-03-21 16:13:15 -07:00
Todd Kennedy
5a50442874 Reload server settings after auto discover
There is an optimization to prevent re-loading server settings if they've
arlready been loaded once. However, in certain circumstances (e.g., server
setting auto discover), we want to be able to reload the server settings.

bug 4091290

Change-Id: I03c47a7fe3b45d1c581401ac891895a00315d45b
2011-03-18 08:56:13 -07:00
Todd Kennedy
dece5050c2 Don't sync messages moved from the sent folder
When processing message updates, we handle messages in the "sent" folder
specially. We continue to do that. However, we must also check that the
given message is still in the "sent" folder.

bug 4096266

Change-Id: Iaa47512fad287e63d8216b755a761b52b324cfff
2011-03-17 13:16:36 -07:00
Andy Stadler
b959d9b9b2 am 22759bac: Handle complex chars policy correctly
* commit '22759bacd95385d95d3d9321f490763df1aba89d':
  Handle complex chars policy correctly
2011-03-16 12:38:57 -07:00
Andy Stadler
22759bacd9 Handle complex chars policy correctly
* We needed to set DevicePolicyMnager.PASSWORD_QUALITY_COMPLEX
* Setting this, we also need to clear some of the defaults for complex
  mode that are not correct for Exchange's definition of "complex".
* Unit tests

Bug: 4092218
Change-Id: Iea7bd05d48f1aa9406222c1db5937cfd7f2662b8
2011-03-16 09:48:08 -07:00
Andy Stadler
033d911dce am 714b2f2d: Merge "Reduce chance of crash when dismissing dialogs asynchronously" into honeycomb-mr1
* commit '714b2f2da36d750eb4acbf505398a44b93546322':
  Reduce chance of crash when dismissing dialogs asynchronously
2011-03-15 23:51:02 -07:00
Andy Stadler
a685d3b019 Reduce chance of crash when dismissing dialogs asynchronously
* Caught & diagnosed by crash while checking settings
* Also possible in MoveMessageToDialog

Bug: 3412875
Change-Id: Ie78c61cf5ca10ce1eedc25ba2eb97ed0ac5bc615
2011-03-15 15:02:48 -07:00
Andy Stadler
ee6686043a am 0820e008: Merge "Fix race condition NPE caught by monkey" into honeycomb-mr1
* commit '0820e00841aca88e70a88a25e891c156fa578088':
  Fix race condition NPE caught by monkey
2011-03-11 08:56:59 -08:00
Andy Stadler
5f830f8608 Fix race condition NPE caught by monkey
Bug: 4080321
Change-Id: Ia6ef0a47f87ffdc96269a95cc3bc5564d2e98440
2011-03-10 14:56:10 -08:00
Todd Kennedy
d43ebd7804 am 19829ef7: Merge "Fix NPE when trying to open attachments" into honeycomb-mr1
* commit '19829ef7edfe1a72a88e0ba57f3ce6c57d9ae8f6':
  Fix NPE when trying to open attachments
2011-03-10 14:27:19 -08:00
Todd Kennedy
f94fdfd4b5 am d135ac61: Merge "Update attachment buttons after loading attachment" into honeycomb-mr1
* commit 'd135ac61ee22c81509c71273b2d053fc36ea210a':
  Update attachment buttons after loading attachment
2011-03-10 14:25:40 -08:00
Todd Kennedy
19829ef7ed Merge "Fix NPE when trying to open attachments" into honeycomb-mr1 2011-03-10 14:23:05 -08:00
Todd Kennedy
074cc5869d Update attachment buttons after loading attachment
We would update the attachment buttons if the UI was becoming visible (i.e.
coming back from a settings page), but, we weren't updating them after the
attachment finished loading.

bug 4074694

Change-Id: I9d235620b5a92c2bbb871f70c9d97350cc151ce8
2011-03-10 09:06:13 -08:00
Todd Kennedy
edd1c9ac7e 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

Change-Id: I831e3abd100664c92f7af585014a03250e40ff64
2011-03-09 17:00:46 -08:00
Marc Blank
225a3ea0b6 am 70e99aa9: Merge "Fix download of non-smart-forwarded attachments" into honeycomb-mr1
* commit '70e99aa97f027f9a7dd19e28f978258025f7d9ed':
  Fix download of non-smart-forwarded attachments
2011-03-09 16:17:33 -08:00
Marc Blank
180b6bdaac am 0af709c2: Merge "Make sure services are started when Email application starts" into honeycomb-mr1
* commit '0af709c2c5f953d8f519af8672c01473d7eed2a3':
  Make sure services are started when Email application starts
2011-03-09 16:15:30 -08:00
Marc Blank
4af17a654b am e233fe31: Merge "Only allow prefetch when on a WiFi network" into honeycomb-mr1
* commit 'e233fe315b5fdc5050ea4e3428856a5370567062':
  Only allow prefetch when on a WiFi network
2011-03-09 16:13:14 -08:00
Marc Blank
70e99aa97f Merge "Fix download of non-smart-forwarded attachments" into honeycomb-mr1 2011-03-09 16:12:10 -08:00
Marc Blank
0af709c2c5 Merge "Make sure services are started when Email application starts" into honeycomb-mr1 2011-03-09 16:10:16 -08:00
Makoto Onuki
2a47caef7d am 553037ba: Merge "Fix NPE in NotificationController" into honeycomb-mr1
* commit '553037ba4ecfc72d68743eff223e16fb9511d7c1':
  Fix NPE in NotificationController
2011-03-09 16:09:00 -08:00