Introducing MessageListFragment.
- Extracted MessageListFragment out of the MessageList activity.
- This is basically pure extraction, with the following conceptual change.
- Now the MessageList activity doesn't know the mailbox id or
the account id. If it needs these ids, it needs to ask the fragment.
- MessageListFragment.LoadMessagesTask tries to determine the account ID
if it's unknown.
Most code in MessageListFragment is directly copied from MessageList
with minimal changes (e.g. pass mActivity instead of 'this' as a Context).
There's a few cleaning up oppotunities. I'll work on them later in a separate
CL.
Change-Id: Ie004cc49b429f2cd8f9de73df5abb94f3054ea0a
This commit is contained in:
Makoto Onuki
parent
9cbc6721c7
commit
601187db42
|
|
@ -23,8 +23,9 @@
|
|||
<include layout="@layout/list_title" />
|
||||
<include layout="@layout/connection_error_banner" />
|
||||
|
||||
<ListView
|
||||
android:id="@android:id/list"
|
||||
<fragment
|
||||
android:id="@+id/list"
|
||||
android:name="com.android.email.activity.MessageListFragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1" />
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2010 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<ListView xmlns:android="http://schemas.android.com/apk/res/android"/>
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,947 @@
|
|||
/*
|
||||
* Copyright (C) 2010 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.email.activity;
|
||||
|
||||
import com.android.email.Controller;
|
||||
import com.android.email.Email;
|
||||
import com.android.email.R;
|
||||
import com.android.email.Utility;
|
||||
import com.android.email.provider.EmailContent;
|
||||
import com.android.email.provider.EmailContent.Account;
|
||||
import com.android.email.provider.EmailContent.Mailbox;
|
||||
import com.android.email.provider.EmailContent.MailboxColumns;
|
||||
import com.android.email.provider.EmailContent.MessageColumns;
|
||||
import com.android.email.service.MailService;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.Fragment;
|
||||
import android.content.ContentResolver;
|
||||
import android.content.ContentUris;
|
||||
import android.database.Cursor;
|
||||
import android.net.Uri;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.view.ContextMenu;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.MenuInflater;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.ContextMenu.ContextMenuInfo;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.ListView;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
import android.widget.AdapterView.OnItemClickListener;
|
||||
|
||||
import java.security.InvalidParameterException;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
// TODO Better method naming
|
||||
|
||||
public class MessageListFragment extends Fragment implements OnItemClickListener,
|
||||
MessagesAdapter.Callback {
|
||||
private static final String STATE_SELECTED_ITEM_TOP =
|
||||
"com.android.email.activity.MessageList.selectedItemTop";
|
||||
private static final String STATE_SELECTED_POSITION =
|
||||
"com.android.email.activity.MessageList.selectedPosition";
|
||||
private static final String STATE_CHECKED_ITEMS =
|
||||
"com.android.email.activity.MessageList.checkedItems";
|
||||
|
||||
// UI Support
|
||||
private Activity mActivity;
|
||||
private Callback mCallback;
|
||||
private ListView mListView;
|
||||
private View mListFooterView;
|
||||
private TextView mListFooterText;
|
||||
private View mListFooterProgress;
|
||||
|
||||
private static final int LIST_FOOTER_MODE_NONE = 0;
|
||||
private static final int LIST_FOOTER_MODE_REFRESH = 1;
|
||||
private static final int LIST_FOOTER_MODE_MORE = 2;
|
||||
private static final int LIST_FOOTER_MODE_SEND = 3;
|
||||
private int mListFooterMode;
|
||||
|
||||
private MessagesAdapter mListAdapter;
|
||||
|
||||
// DB access
|
||||
private ContentResolver mResolver;
|
||||
private long mAccountId = -1;
|
||||
private long mMailboxId = -1;
|
||||
private LoadMessagesTask mLoadMessagesTask;
|
||||
private SetFooterTask mSetFooterTask;
|
||||
|
||||
/* package */ static final String[] MESSAGE_PROJECTION = new String[] {
|
||||
EmailContent.RECORD_ID, MessageColumns.MAILBOX_KEY, MessageColumns.ACCOUNT_KEY,
|
||||
MessageColumns.DISPLAY_NAME, MessageColumns.SUBJECT, MessageColumns.TIMESTAMP,
|
||||
MessageColumns.FLAG_READ, MessageColumns.FLAG_FAVORITE, MessageColumns.FLAG_ATTACHMENT,
|
||||
MessageColumns.FLAGS,
|
||||
};
|
||||
|
||||
// Controller access
|
||||
private Controller mController;
|
||||
|
||||
// Misc members
|
||||
private Boolean mPushModeMailbox = null;
|
||||
private int mSavedItemTop = 0;
|
||||
private int mSavedItemPosition = -1;
|
||||
private int mFirstSelectedItemTop = 0;
|
||||
private int mFirstSelectedItemPosition = -1;
|
||||
private int mFirstSelectedItemHeight = -1;
|
||||
private boolean mCanAutoRefresh;
|
||||
|
||||
/**
|
||||
* Callback interface that owning activities must implement
|
||||
*/
|
||||
public interface Callback {
|
||||
public void onSendPendingMessages();
|
||||
public void onSelectionChanged();
|
||||
public void onMailboxNotFound();
|
||||
}
|
||||
|
||||
private ListView getListView() {
|
||||
return mListView;
|
||||
}
|
||||
|
||||
private MenuInflater getMenuInflater() {
|
||||
return mActivity.getMenuInflater();
|
||||
}
|
||||
|
||||
/* package */ MessagesAdapter getAdapterForTest() {
|
||||
return mListAdapter;
|
||||
}
|
||||
|
||||
// comment on when it's valid, and how to tell
|
||||
/**
|
||||
* @return the account id, or -1 if it's unkown yet.
|
||||
*/
|
||||
public long getAccountId() {
|
||||
return mAccountId;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the mailbox id, which is the value set to {@link #openMailbox(long, long)}.
|
||||
* (Meaning it will never return -1, but may return special values,
|
||||
* eg {@link Mailbox#QUERY_ALL_INBOXES}).
|
||||
*/
|
||||
public long getMailboxId() {
|
||||
return mMailboxId;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if the mailbox is a "special" box. (e.g. combined inbox, all starred, etc.)
|
||||
*/
|
||||
public boolean isMagicMailbox() {
|
||||
return mMailboxId < 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return if it's an outbox.
|
||||
*/
|
||||
public boolean isOutbox() {
|
||||
return mListFooterMode == LIST_FOOTER_MODE_SEND;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the number of messages that are currently selecteed.
|
||||
*/
|
||||
public int getSelectedCount() {
|
||||
return mListAdapter.getSelectedSet().size();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
mActivity = getActivity();
|
||||
mResolver = mActivity.getContentResolver();
|
||||
mController = Controller.getInstance(mActivity);
|
||||
mCanAutoRefresh = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
mListView = (ListView) inflater.inflate(R.layout.message_list_fragment, container, false);
|
||||
mListView.setOnItemClickListener(this);
|
||||
mListView.setItemsCanFocus(false);
|
||||
mActivity.registerForContextMenu(mListView);
|
||||
|
||||
mListAdapter = new MessagesAdapter(mActivity, new Handler(), this);
|
||||
mListView.setAdapter(mListAdapter);
|
||||
|
||||
mListFooterView = inflater.inflate(R.layout.message_list_item_footer, mListView, false);
|
||||
|
||||
// TODO extend this to properly deal with multiple mailboxes, cursor, etc.
|
||||
|
||||
return mListView;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onReady(Bundle savedInstanceState) {
|
||||
super.onReady(savedInstanceState);
|
||||
if (savedInstanceState != null) {
|
||||
// Fragment doesn't have this method. Call it manually.
|
||||
onRestoreInstanceState(savedInstanceState);
|
||||
}
|
||||
}
|
||||
|
||||
public void setCallback(Callback callback) {
|
||||
mCallback = callback;
|
||||
}
|
||||
|
||||
/**
|
||||
* Open an mailbox.
|
||||
*
|
||||
* @param accountId account id of the mailbox, if already known. Pass -1 if unknown or
|
||||
* {@code mailboxId} is of a special mailbox. If -1 is passed, this fragment will find it
|
||||
* using {@code mailboxId}, which the activity can get later with {@link #getAccountId()}.
|
||||
* Passing -1 is always safe, but we can skip a database lookup if specified.
|
||||
*
|
||||
* @param mailboxId the ID of a mailbox, or one of "special" mailbox IDs like
|
||||
* {@link Mailbox#QUERY_ALL_INBOXES}. -1 is not allowed.
|
||||
*/
|
||||
public void openMailbox(long accountId, long mailboxId) {
|
||||
if (mailboxId == -1) {
|
||||
throw new InvalidParameterException();
|
||||
}
|
||||
mAccountId = accountId;
|
||||
mMailboxId = mailboxId;
|
||||
|
||||
Utility.cancelTaskInterrupt(mLoadMessagesTask);
|
||||
mLoadMessagesTask = new LoadMessagesTask(mailboxId, accountId);
|
||||
mLoadMessagesTask.execute();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResume() {
|
||||
super.onResume();
|
||||
restoreListPosition();
|
||||
autoRefreshStaleMailbox();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
Utility.cancelTaskInterrupt(mLoadMessagesTask);
|
||||
mLoadMessagesTask = null;
|
||||
Utility.cancelTaskInterrupt(mSetFooterTask);
|
||||
mSetFooterTask = null;
|
||||
|
||||
if (mListAdapter != null) {
|
||||
mListAdapter.changeCursor(null);
|
||||
}
|
||||
super.onDestroy();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onSaveInstanceState(Bundle outState) {
|
||||
super.onSaveInstanceState(outState);
|
||||
saveListPosition();
|
||||
outState.putInt(STATE_SELECTED_POSITION, mSavedItemPosition);
|
||||
outState.putInt(STATE_SELECTED_ITEM_TOP, mSavedItemTop);
|
||||
Set<Long> checkedset = mListAdapter.getSelectedSet();
|
||||
long[] checkedarray = new long[checkedset.size()];
|
||||
int i = 0;
|
||||
for (Long l : checkedset) {
|
||||
checkedarray[i] = l;
|
||||
i++;
|
||||
}
|
||||
outState.putLongArray(STATE_CHECKED_ITEMS, checkedarray);
|
||||
}
|
||||
|
||||
// Unit tests use it
|
||||
/* package */ void onRestoreInstanceState(Bundle savedInstanceState) {
|
||||
mSavedItemTop = savedInstanceState.getInt(STATE_SELECTED_ITEM_TOP, 0);
|
||||
mSavedItemPosition = savedInstanceState.getInt(STATE_SELECTED_POSITION, -1);
|
||||
Set<Long> checkedset = mListAdapter.getSelectedSet();
|
||||
for (long l: savedInstanceState.getLongArray(STATE_CHECKED_ITEMS)) {
|
||||
checkedset.add(l);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Save the focused list item.
|
||||
*/
|
||||
private void saveListPosition() {
|
||||
mSavedItemPosition = getListView().getSelectedItemPosition();
|
||||
if (mSavedItemPosition >= 0 && getListView().isSelected()) {
|
||||
mSavedItemTop = getListView().getSelectedView().getTop();
|
||||
} else {
|
||||
mSavedItemPosition = getListView().getFirstVisiblePosition();
|
||||
if (mSavedItemPosition >= 0) {
|
||||
mSavedItemTop = 0;
|
||||
View topChild = getListView().getChildAt(0);
|
||||
if (topChild != null) {
|
||||
mSavedItemTop = topChild.getTop();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Restore the focused list item.
|
||||
*/
|
||||
private void restoreListPosition() {
|
||||
if (mSavedItemPosition >= 0 && mSavedItemPosition < getListView().getCount()) {
|
||||
getListView().setSelectionFromTop(mSavedItemPosition, mSavedItemTop);
|
||||
mSavedItemPosition = -1;
|
||||
mSavedItemTop = 0;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when a message is clicked.
|
||||
*/
|
||||
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
||||
if (view != mListFooterView) {
|
||||
MessageListItem itemView = (MessageListItem) view;
|
||||
onOpenMessage(id, itemView.mMailboxId);
|
||||
} else {
|
||||
doFooterClick();
|
||||
}
|
||||
}
|
||||
|
||||
public void onMultiToggleRead() {
|
||||
onMultiToggleRead(mListAdapter.getSelectedSet());
|
||||
}
|
||||
|
||||
public void onMultiToggleFavorite() {
|
||||
onMultiToggleFavorite(mListAdapter.getSelectedSet());
|
||||
}
|
||||
|
||||
public void onMultiDelete() {
|
||||
onMultiDelete(mListAdapter.getSelectedSet());
|
||||
}
|
||||
|
||||
public void createContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
|
||||
AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
|
||||
// There is no context menu for the list footer
|
||||
if (info.targetView == mListFooterView) {
|
||||
return;
|
||||
}
|
||||
MessageListItem itemView = (MessageListItem) info.targetView;
|
||||
|
||||
Cursor c = (Cursor) getListView().getItemAtPosition(info.position);
|
||||
String messageName = c.getString(MessagesAdapter.COLUMN_SUBJECT);
|
||||
|
||||
menu.setHeaderTitle(messageName);
|
||||
|
||||
// TODO: There is probably a special context menu for the trash
|
||||
Mailbox mailbox = Mailbox.restoreMailboxWithId(mActivity, itemView.mMailboxId);
|
||||
if (mailbox == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
switch (mailbox.mType) {
|
||||
case EmailContent.Mailbox.TYPE_DRAFTS:
|
||||
getMenuInflater().inflate(R.menu.message_list_context_drafts, menu);
|
||||
break;
|
||||
case EmailContent.Mailbox.TYPE_OUTBOX:
|
||||
getMenuInflater().inflate(R.menu.message_list_context_outbox, menu);
|
||||
break;
|
||||
case EmailContent.Mailbox.TYPE_TRASH:
|
||||
getMenuInflater().inflate(R.menu.message_list_context_trash, menu);
|
||||
break;
|
||||
default:
|
||||
getMenuInflater().inflate(R.menu.message_list_context, menu);
|
||||
// The default menu contains "mark as read". If the message is read, change
|
||||
// the menu text to "mark as unread."
|
||||
if (itemView.mRead) {
|
||||
menu.findItem(R.id.mark_as_read).setTitle(R.string.mark_as_unread_action);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean onContextItemSelected(MenuItem item) {
|
||||
AdapterView.AdapterContextMenuInfo info =
|
||||
(AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
|
||||
MessageListItem itemView = (MessageListItem) info.targetView;
|
||||
|
||||
switch (item.getItemId()) {
|
||||
case R.id.open:
|
||||
onOpenMessage(info.id, itemView.mMailboxId);
|
||||
return true;
|
||||
case R.id.delete:
|
||||
onDelete(info.id, itemView.mAccountId);
|
||||
return true;
|
||||
case R.id.reply:
|
||||
onReply(itemView.mMessageId);
|
||||
return true;
|
||||
case R.id.reply_all:
|
||||
onReplyAll(itemView.mMessageId);
|
||||
return true;
|
||||
case R.id.forward:
|
||||
onForward(itemView.mMessageId);
|
||||
return true;
|
||||
case R.id.mark_as_read:
|
||||
onSetMessageRead(info.id, !itemView.mRead);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Refresh the list. NOOP for special mailboxes. (e.g. combined inbox)
|
||||
*/
|
||||
public void onRefresh() {
|
||||
// TODO: Should not be reading from DB in UI thread - need a cleaner way to get accountId
|
||||
// TODO It already has account id. Second DB lookup isn't necessary.
|
||||
if (mMailboxId >= 0) {
|
||||
Mailbox mailbox = Mailbox.restoreMailboxWithId(mActivity, mMailboxId);
|
||||
if (mailbox != null) {
|
||||
mController.updateMailbox(mailbox.mAccountKey, mMailboxId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void onDeselectAll() {
|
||||
mListAdapter.getSelectedSet().clear();
|
||||
getListView().invalidateViews();
|
||||
if (mCallback != null) {
|
||||
mCallback.onSelectionChanged();
|
||||
}
|
||||
}
|
||||
|
||||
private void onOpenMessage(long messageId, long mailboxId) {
|
||||
// TODO: Should not be reading from DB in UI thread
|
||||
EmailContent.Mailbox mailbox = EmailContent.Mailbox.restoreMailboxWithId(mActivity,
|
||||
mailboxId);
|
||||
if (mailbox == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (mailbox.mType == EmailContent.Mailbox.TYPE_DRAFTS) {
|
||||
MessageCompose.actionEditDraft(mActivity, messageId);
|
||||
} else {
|
||||
final boolean disableReply = (mailbox.mType == EmailContent.Mailbox.TYPE_TRASH);
|
||||
// WARNING: here we pass mMailboxId, which can be the negative id of a compound
|
||||
// mailbox, instead of the mailboxId of the particular message that is opened
|
||||
MessageView.actionView(mActivity, messageId, mMailboxId, disableReply);
|
||||
}
|
||||
}
|
||||
|
||||
private void onReply(long messageId) {
|
||||
MessageCompose.actionReply(mActivity, messageId, false);
|
||||
}
|
||||
|
||||
private void onReplyAll(long messageId) {
|
||||
MessageCompose.actionReply(mActivity, messageId, true);
|
||||
}
|
||||
|
||||
private void onForward(long messageId) {
|
||||
MessageCompose.actionForward(mActivity, messageId);
|
||||
}
|
||||
|
||||
private void onLoadMoreMessages() {
|
||||
if (mMailboxId >= 0) {
|
||||
mController.loadMoreMessages(mMailboxId);
|
||||
}
|
||||
}
|
||||
|
||||
private void onDelete(long messageId, long accountId) { // TODO no account id needed
|
||||
mController.deleteMessage(messageId, accountId);
|
||||
Toast.makeText(mActivity, mActivity.getResources().getQuantityString( // TODO Utility.
|
||||
R.plurals.message_deleted_toast, 1), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
|
||||
private void onSetMessageRead(long messageId, boolean newRead) {
|
||||
mController.setMessageRead(messageId, newRead);
|
||||
}
|
||||
|
||||
private void onSetMessageFavorite(long messageId, boolean newFavorite) {
|
||||
mController.setMessageFavorite(messageId, newFavorite);
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggles a set read/unread states. Note, the default behavior is "mark unread", so the
|
||||
* sense of the helper methods is "true=unread".
|
||||
*
|
||||
* @param selectedSet The current list of selected items
|
||||
*/
|
||||
private void onMultiToggleRead(Set<Long> selectedSet) {
|
||||
toggleMultiple(selectedSet, new MultiToggleHelper() {
|
||||
|
||||
public boolean getField(long messageId, Cursor c) {
|
||||
return c.getInt(MessagesAdapter.COLUMN_READ) == 0;
|
||||
}
|
||||
|
||||
public boolean setField(long messageId, Cursor c, boolean newValue) {
|
||||
boolean oldValue = getField(messageId, c);
|
||||
if (oldValue != newValue) {
|
||||
onSetMessageRead(messageId, !newValue);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggles a set of favorites (stars)
|
||||
*
|
||||
* @param selectedSet The current list of selected items
|
||||
*/
|
||||
private void onMultiToggleFavorite(Set<Long> selectedSet) {
|
||||
toggleMultiple(selectedSet, new MultiToggleHelper() {
|
||||
|
||||
public boolean getField(long messageId, Cursor c) {
|
||||
return c.getInt(MessagesAdapter.COLUMN_FAVORITE) != 0;
|
||||
}
|
||||
|
||||
public boolean setField(long messageId, Cursor c, boolean newValue) {
|
||||
boolean oldValue = getField(messageId, c);
|
||||
if (oldValue != newValue) {
|
||||
onSetMessageFavorite(messageId, newValue);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void onMultiDelete(Set<Long> selectedSet) {
|
||||
// Clone the set, because deleting is going to thrash things
|
||||
HashSet<Long> cloneSet = new HashSet<Long>(selectedSet);
|
||||
for (Long id : cloneSet) {
|
||||
mController.deleteMessage(id, -1);
|
||||
}
|
||||
Toast.makeText(mActivity, mActivity.getResources().getQuantityString(
|
||||
R.plurals.message_deleted_toast, cloneSet.size()), Toast.LENGTH_SHORT).show();
|
||||
selectedSet.clear();
|
||||
if (mCallback != null) {
|
||||
mCallback.onSelectionChanged();
|
||||
}
|
||||
}
|
||||
|
||||
private interface MultiToggleHelper {
|
||||
/**
|
||||
* Return true if the field of interest is "set". If one or more are false, then our
|
||||
* bulk action will be to "set". If all are set, our bulk action will be to "clear".
|
||||
* @param messageId the message id of the current message
|
||||
* @param c the cursor, positioned to the item of interest
|
||||
* @return true if the field at this row is "set"
|
||||
*/
|
||||
public boolean getField(long messageId, Cursor c);
|
||||
|
||||
/**
|
||||
* Set or clear the field of interest. Return true if a change was made.
|
||||
* @param messageId the message id of the current message
|
||||
* @param c the cursor, positioned to the item of interest
|
||||
* @param newValue the new value to be set at this row
|
||||
* @return true if a change was actually made
|
||||
*/
|
||||
public boolean setField(long messageId, Cursor c, boolean newValue);
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggle multiple fields in a message, using the following logic: If one or more fields
|
||||
* are "clear", then "set" them. If all fields are "set", then "clear" them all.
|
||||
*
|
||||
* @param selectedSet the set of messages that are selected
|
||||
* @param helper functions to implement the specific getter & setter
|
||||
* @return the number of messages that were updated
|
||||
*/
|
||||
private int toggleMultiple(Set<Long> selectedSet, MultiToggleHelper helper) {
|
||||
Cursor c = mListAdapter.getCursor();
|
||||
boolean anyWereFound = false;
|
||||
boolean allWereSet = true;
|
||||
|
||||
c.moveToPosition(-1);
|
||||
while (c.moveToNext()) {
|
||||
long id = c.getInt(MessagesAdapter.COLUMN_ID);
|
||||
if (selectedSet.contains(Long.valueOf(id))) {
|
||||
anyWereFound = true;
|
||||
if (!helper.getField(id, c)) {
|
||||
allWereSet = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int numChanged = 0;
|
||||
|
||||
if (anyWereFound) {
|
||||
boolean newValue = !allWereSet;
|
||||
c.moveToPosition(-1);
|
||||
while (c.moveToNext()) {
|
||||
long id = c.getInt(MessagesAdapter.COLUMN_ID);
|
||||
if (selectedSet.contains(Long.valueOf(id))) {
|
||||
if (helper.setField(id, c, newValue)) {
|
||||
++numChanged;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return numChanged;
|
||||
}
|
||||
|
||||
/**
|
||||
* Test selected messages for showing appropriate labels
|
||||
* @param selectedSet
|
||||
* @param column_id
|
||||
* @param defaultflag
|
||||
* @return true when the specified flagged message is selected
|
||||
*/
|
||||
private boolean testMultiple(Set<Long> selectedSet, int column_id, boolean defaultflag) {
|
||||
Cursor c = mListAdapter.getCursor();
|
||||
if (c == null || c.isClosed()) {
|
||||
return false;
|
||||
}
|
||||
c.moveToPosition(-1);
|
||||
while (c.moveToNext()) {
|
||||
long id = c.getInt(MessagesAdapter.COLUMN_ID);
|
||||
if (selectedSet.contains(Long.valueOf(id))) {
|
||||
if (c.getInt(column_id) == (defaultflag? 1 : 0)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if one or more non-starred messages are selected.
|
||||
*/
|
||||
public boolean doesSelectionContainNonStarredMessage() {
|
||||
return testMultiple(mListAdapter.getSelectedSet(), MessagesAdapter.COLUMN_FAVORITE,
|
||||
false);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if one or more read messages are selected.
|
||||
*/
|
||||
public boolean doesSelectionContainReadMessage() {
|
||||
return testMultiple(mListAdapter.getSelectedSet(), MessagesAdapter.COLUMN_READ, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements a timed refresh of "stale" mailboxes. This should only happen when
|
||||
* multiple conditions are true, including:
|
||||
* Only when the user explicitly opens the mailbox (not onResume, for example)
|
||||
* Only for real, non-push mailboxes
|
||||
* Only when the mailbox is "stale" (currently set to 5 minutes since last refresh)
|
||||
*/
|
||||
private void autoRefreshStaleMailbox() {
|
||||
if (!mCanAutoRefresh
|
||||
|| (mListAdapter.getCursor() == null) // Check if messages info is loaded
|
||||
|| (mPushModeMailbox != null && mPushModeMailbox) // Check the push mode
|
||||
|| (mMailboxId < 0)) { // Check if this mailbox is synthetic/combined
|
||||
return;
|
||||
}
|
||||
mCanAutoRefresh = false;
|
||||
if (!Email.mailboxRequiresRefresh(mMailboxId)) {
|
||||
return;
|
||||
}
|
||||
onRefresh();
|
||||
}
|
||||
|
||||
public void updateListPosition() { // TODO give it a better name
|
||||
int listViewHeight = getListView().getHeight();
|
||||
if (mListAdapter.getSelectedSet().size() == 1 && mFirstSelectedItemPosition >= 0
|
||||
&& mFirstSelectedItemPosition < getListView().getCount()
|
||||
&& listViewHeight < mFirstSelectedItemTop) {
|
||||
getListView().setSelectionFromTop(mFirstSelectedItemPosition,
|
||||
listViewHeight - mFirstSelectedItemHeight);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Show/hide the progress icon on the list footer. It's called by the host activity.
|
||||
* TODO: It might be cleaner if the fragment listen to the controller events and show it by
|
||||
* itself, rather than letting the activity controll this.
|
||||
*/
|
||||
public void showProgressIcon(boolean show) {
|
||||
if (mListFooterProgress != null) {
|
||||
mListFooterProgress.setVisibility(show ? View.VISIBLE : View.GONE);
|
||||
}
|
||||
setListFooterText(show);
|
||||
}
|
||||
|
||||
// Adapter callbacks
|
||||
public void onAdapterFavoriteChanged(MessageListItem itemView, boolean newFavorite) {
|
||||
onSetMessageFavorite(itemView.mMessageId, newFavorite);
|
||||
}
|
||||
|
||||
public void onAdapterRequery() {
|
||||
if (mCallback != null) {
|
||||
// This updates the "multi-selection" button labels.
|
||||
mCallback.onSelectionChanged();
|
||||
}
|
||||
}
|
||||
|
||||
public void onAdapterSelectedChanged(MessageListItem itemView, boolean newSelected,
|
||||
int mSelectedCount) {
|
||||
if (mSelectedCount == 1 && newSelected) {
|
||||
mFirstSelectedItemPosition = getListView().getPositionForView(itemView);
|
||||
mFirstSelectedItemTop = itemView.getBottom();
|
||||
mFirstSelectedItemHeight = itemView.getHeight();
|
||||
} else {
|
||||
mFirstSelectedItemPosition = -1;
|
||||
}
|
||||
if (mCallback != null) {
|
||||
mCallback.onSelectionChanged();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the fixed footer view if appropriate (not always - not all accounts & mailboxes).
|
||||
*
|
||||
* Here are some rules (finish this list):
|
||||
*
|
||||
* Any merged, synced box (except send): refresh
|
||||
* Any push-mode account: refresh
|
||||
* Any non-push-mode account: load more
|
||||
* Any outbox (send again):
|
||||
*
|
||||
* @param mailboxId the ID of the mailbox
|
||||
* @param accountId the ID of the account
|
||||
*/
|
||||
private void addFooterView(long mailboxId, long accountId) {
|
||||
// first, look for shortcuts that don't need us to spin up a DB access task
|
||||
if (mailboxId == Mailbox.QUERY_ALL_INBOXES
|
||||
|| mailboxId == Mailbox.QUERY_ALL_UNREAD
|
||||
|| mailboxId == Mailbox.QUERY_ALL_FAVORITES) {
|
||||
finishFooterView(LIST_FOOTER_MODE_REFRESH);
|
||||
return;
|
||||
}
|
||||
if (mailboxId == Mailbox.QUERY_ALL_DRAFTS) {
|
||||
finishFooterView(LIST_FOOTER_MODE_NONE);
|
||||
return;
|
||||
}
|
||||
if (mailboxId == Mailbox.QUERY_ALL_OUTBOX) {
|
||||
finishFooterView(LIST_FOOTER_MODE_SEND);
|
||||
return;
|
||||
}
|
||||
|
||||
// We don't know enough to select the footer command type (yet), so we'll
|
||||
// launch an async task to do the remaining lookups and decide what to do
|
||||
mSetFooterTask = new SetFooterTask();
|
||||
mSetFooterTask.execute(mailboxId, accountId);
|
||||
}
|
||||
|
||||
private final static String[] MAILBOX_ACCOUNT_AND_TYPE_PROJECTION =
|
||||
new String[] { MailboxColumns.ACCOUNT_KEY, MailboxColumns.TYPE };
|
||||
|
||||
private class SetFooterTask extends AsyncTask<Long, Void, Integer> {
|
||||
/**
|
||||
* There are two operational modes here, requiring different lookup.
|
||||
* mailboxIs != -1: A specific mailbox - check its type, then look up its account
|
||||
* accountId != -1: A specific account - look up the account
|
||||
*/
|
||||
@Override
|
||||
protected Integer doInBackground(Long... params) {
|
||||
long mailboxId = params[0];
|
||||
long accountId = params[1];
|
||||
int mailboxType = -1;
|
||||
if (mailboxId != -1) {
|
||||
try {
|
||||
Uri uri = ContentUris.withAppendedId(Mailbox.CONTENT_URI, mailboxId);
|
||||
Cursor c = mResolver.query(uri, MAILBOX_ACCOUNT_AND_TYPE_PROJECTION,
|
||||
null, null, null);
|
||||
if (c.moveToFirst()) {
|
||||
try {
|
||||
accountId = c.getLong(0);
|
||||
mailboxType = c.getInt(1);
|
||||
} finally {
|
||||
c.close();
|
||||
}
|
||||
}
|
||||
} catch (IllegalArgumentException iae) {
|
||||
// can't do any more here
|
||||
return LIST_FOOTER_MODE_NONE;
|
||||
}
|
||||
}
|
||||
switch (mailboxType) {
|
||||
case Mailbox.TYPE_OUTBOX:
|
||||
return LIST_FOOTER_MODE_SEND;
|
||||
case Mailbox.TYPE_DRAFTS:
|
||||
return LIST_FOOTER_MODE_NONE;
|
||||
}
|
||||
if (accountId != -1) {
|
||||
// This is inefficient but the best fix is not here but in isMessagingController
|
||||
Account account = Account.restoreAccountWithId(mActivity, accountId);
|
||||
if (account != null) {
|
||||
// TODO move this to more appropriate place
|
||||
// (don't change member fields on a worker thread.)
|
||||
mPushModeMailbox = account.mSyncInterval == Account.CHECK_INTERVAL_PUSH;
|
||||
if (mController.isMessagingController(account)) {
|
||||
return LIST_FOOTER_MODE_MORE; // IMAP or POP
|
||||
} else {
|
||||
return LIST_FOOTER_MODE_NONE; // EAS
|
||||
}
|
||||
}
|
||||
}
|
||||
return LIST_FOOTER_MODE_NONE;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPostExecute(Integer listFooterMode) {
|
||||
if (isCancelled()) {
|
||||
return;
|
||||
}
|
||||
if (listFooterMode == null) {
|
||||
return;
|
||||
}
|
||||
finishFooterView(listFooterMode);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the fixed footer view as specified, and set up the test as well.
|
||||
*
|
||||
* @param listFooterMode the footer mode we've determined should be used for this list
|
||||
*/
|
||||
private void finishFooterView(int listFooterMode) {
|
||||
mListFooterMode = listFooterMode;
|
||||
if (mListFooterMode != LIST_FOOTER_MODE_NONE) {
|
||||
getListView().addFooterView(mListFooterView);
|
||||
getListView().setAdapter(mListAdapter);
|
||||
|
||||
mListFooterProgress = mListFooterView.findViewById(R.id.progress);
|
||||
mListFooterText = (TextView) mListFooterView.findViewById(R.id.main_text);
|
||||
setListFooterText(false);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the list footer text based on mode and "active" status
|
||||
*/
|
||||
private void setListFooterText(boolean active) {
|
||||
if (mListFooterMode != LIST_FOOTER_MODE_NONE) {
|
||||
int footerTextId = 0;
|
||||
switch (mListFooterMode) {
|
||||
case LIST_FOOTER_MODE_REFRESH:
|
||||
footerTextId = active ? R.string.status_loading_more
|
||||
: R.string.refresh_action;
|
||||
break;
|
||||
case LIST_FOOTER_MODE_MORE:
|
||||
footerTextId = active ? R.string.status_loading_more
|
||||
: R.string.message_list_load_more_messages_action;
|
||||
break;
|
||||
case LIST_FOOTER_MODE_SEND:
|
||||
footerTextId = active ? R.string.status_sending_messages
|
||||
: R.string.message_list_send_pending_messages_action;
|
||||
break;
|
||||
}
|
||||
mListFooterText.setText(footerTextId);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle a click in the list footer, which changes meaning depending on what we're looking at.
|
||||
*/
|
||||
private void doFooterClick() {
|
||||
switch (mListFooterMode) {
|
||||
case LIST_FOOTER_MODE_NONE: // should never happen
|
||||
break;
|
||||
case LIST_FOOTER_MODE_REFRESH:
|
||||
onRefresh();
|
||||
break;
|
||||
case LIST_FOOTER_MODE_MORE:
|
||||
onLoadMoreMessages();
|
||||
break;
|
||||
case LIST_FOOTER_MODE_SEND:
|
||||
if (mCallback != null) {
|
||||
mCallback.onSendPendingMessages(); // TODO move to controller
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Async task for loading a single folder out of the UI thread
|
||||
*
|
||||
* The code here (for merged boxes) is a placeholder/hack and should be replaced. Some
|
||||
* specific notes:
|
||||
* TODO: Move the double query into a specialized URI that returns all inbox messages
|
||||
* and do the dirty work in raw SQL in the provider.
|
||||
* TODO: Generalize the query generation so we can reuse it in MessageView (for next/prev)
|
||||
*/
|
||||
private class LoadMessagesTask extends AsyncTask<Void, Void, Cursor> {
|
||||
|
||||
private final long mMailboxKey;
|
||||
private long mAccountKey;
|
||||
|
||||
/**
|
||||
* Special constructor to cache some local info
|
||||
*/
|
||||
public LoadMessagesTask(long mailboxKey, long accountKey) {
|
||||
mMailboxKey = mailboxKey;
|
||||
mAccountKey = accountKey;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Cursor doInBackground(Void... params) {
|
||||
// First, determine account id, if unknown
|
||||
if (mAccountKey == -1) { // TODO Use constant instead of -1
|
||||
if (isMagicMailbox()) {
|
||||
// Magic mailbox. No accountid.
|
||||
} else {
|
||||
EmailContent.Mailbox mailbox =
|
||||
EmailContent.Mailbox.restoreMailboxWithId(mActivity, mMailboxKey);
|
||||
if (mailbox != null) {
|
||||
mAccountKey = mailbox.mAccountKey;
|
||||
} else {
|
||||
// Mailbox not found.
|
||||
// TODO We used to close the activity in this case, but what to do now??
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Load messages
|
||||
String selection =
|
||||
Utility.buildMailboxIdSelection(mResolver, mMailboxKey);
|
||||
Cursor c = mActivity.managedQuery(EmailContent.Message.CONTENT_URI, MESSAGE_PROJECTION,
|
||||
selection, null, EmailContent.MessageColumns.TIMESTAMP + " DESC");
|
||||
return c;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPostExecute(Cursor cursor) {
|
||||
if (isCancelled()) {
|
||||
return;
|
||||
}
|
||||
if (cursor == null || cursor.isClosed()) {
|
||||
if (mCallback != null) {
|
||||
mCallback.onMailboxNotFound();
|
||||
}
|
||||
return;
|
||||
}
|
||||
MessageListFragment.this.mAccountId = mAccountKey;
|
||||
|
||||
addFooterView(mMailboxKey, mAccountKey);
|
||||
|
||||
// TODO changeCursor(null)??
|
||||
mListAdapter.changeCursor(cursor);
|
||||
|
||||
// changeCursor occurs the jumping of position in ListView, so it's need to restore
|
||||
// the position;
|
||||
restoreListPosition();
|
||||
autoRefreshStaleMailbox();
|
||||
// Reset the "new messages" count in the service, since we're seeing them now
|
||||
if (mMailboxKey == Mailbox.QUERY_ALL_INBOXES) {
|
||||
MailService.resetNewMessageCount(mActivity, -1);
|
||||
} else if (mMailboxKey >= 0 && mAccountKey != -1) {
|
||||
MailService.resetNewMessageCount(mActivity, mAccountKey);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -102,7 +102,7 @@ public class MessageListUnitTests
|
|||
private void setUpCustomCursor() throws Throwable {
|
||||
runTestOnUiThread(new Runnable() {
|
||||
public void run() {
|
||||
mListAdapter = (CursorAdapter)mMessageList.getListAdapter();
|
||||
mListAdapter = mMessageList.getListFragmentForTest().getAdapterForTest();
|
||||
mRowsMap = new HashMap<Long, Map<String, Object>>(0);
|
||||
mIDarray = new ArrayList<Long>(0);
|
||||
final int FIMI = Message.FLAG_INCOMING_MEETING_INVITE;
|
||||
|
|
@ -116,7 +116,7 @@ public class MessageListUnitTests
|
|||
addElement(7, Long.MIN_VALUE, Long.MIN_VALUE, "h", "H", 0, 0, 0, 0, 0);
|
||||
addElement(8, Long.MIN_VALUE, Long.MIN_VALUE, "i", "I", 0, 0, 0, 0, 0);
|
||||
addElement(9, Long.MIN_VALUE, Long.MIN_VALUE, "j", "J", 0, 0, 0, 0, 0);
|
||||
CustomCursor cc = new CustomCursor(mIDarray, MessageList.MESSAGE_PROJECTION,
|
||||
CustomCursor cc = new CustomCursor(mIDarray, MessageListFragment.MESSAGE_PROJECTION,
|
||||
mRowsMap);
|
||||
mListAdapter.changeCursor(cc);
|
||||
}
|
||||
|
|
@ -126,14 +126,14 @@ public class MessageListUnitTests
|
|||
public void testRestoreAndSaveInstanceState() throws Throwable {
|
||||
setUpCustomCursor();
|
||||
Bundle bundle = new Bundle();
|
||||
mMessageList.onSaveInstanceState(bundle);
|
||||
mMessageList.getListFragmentForTest().onSaveInstanceState(bundle);
|
||||
long[] checkedarray = bundle.getLongArray(STATE_CHECKED_ITEMS);
|
||||
assertEquals(0, checkedarray.length);
|
||||
Set<Long> checkedset = ((MessagesAdapter)mListAdapter).getSelectedSet();
|
||||
checkedset.add(1L);
|
||||
checkedset.add(3L);
|
||||
checkedset.add(5L);
|
||||
mMessageList.onSaveInstanceState(bundle);
|
||||
mMessageList.getListFragmentForTest().onSaveInstanceState(bundle);
|
||||
checkedarray = bundle.getLongArray(STATE_CHECKED_ITEMS);
|
||||
java.util.Arrays.sort(checkedarray);
|
||||
assertEquals(3, checkedarray.length);
|
||||
|
|
@ -152,7 +152,7 @@ public class MessageListUnitTests
|
|||
Set<Long> checkedset = ((MessagesAdapter)mListAdapter).getSelectedSet();
|
||||
assertEquals(0, checkedset.size());
|
||||
bundle.putLongArray(STATE_CHECKED_ITEMS, checkedarray);
|
||||
mMessageList.onRestoreInstanceState(bundle);
|
||||
mMessageList.getListFragmentForTest().onRestoreInstanceState(bundle);
|
||||
checkedset = ((MessagesAdapter)mListAdapter).getSelectedSet();
|
||||
assertEquals(3, checkedset.size());
|
||||
assertTrue(checkedset.contains(1L));
|
||||
|
|
|
|||
Loading…
Reference in New Issue