ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add recent mailboxes to the mailbox list 

Change-Id: I84ee9d0da43ccac4d10e5122f57583c4b39cf65d
This commit is contained in:
Todd Kennedy 2011-06-07 16:38:18 -07:00
parent 1b404f4fff
commit dc6928d798
3 changed files with 52 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@ -279,6 +279,11 @@
<string name="mailbox_list_account_selector_mailbox_header_fmt">
Recent mailboxes(<xliff:g id="email_address">%s</xliff:g>)</string>
<!-- Mailbox list header for user folders [CHAR LIMIT=30] -->
<string name="mailbox_list_user_mailboxes">All folders</string>
<!-- Mailbox list header for recent folders [CHAR LIMIT=30] -->
<string name="mailbox_list_recent_mailboxes">Recent folders</string>
<!-- Appears at the bottom of list of messages; user selects to load more messages from that folder. -->
<string name="message_list_load_more_messages_action">Load more messages</string>
<!-- The number of messages that are currently selected for various operations such as

56
src/com/android/email/activity/MailboxFragmentAdapter.java
View File

@ -33,6 +33,9 @@ import com.android.emailcommon.provider.EmailContent.Message;
import com.android.emailcommon.provider.Mailbox;
import com.android.emailcommon.utility.Utility;
import java.util.ArrayList;
import android.content.ContentUris;
import android.content.Context;
import android.content.Loader;
import android.database.Cursor;
@ -142,9 +145,13 @@ class MailboxFragmentAdapter extends CursorAdapter {
/** All mailboxes for the account */
private static final String ALL_MAILBOX_SELECTION = MailboxColumns.ACCOUNT_KEY + "=?" +
" AND " + Mailbox.USER_VISIBLE_MAILBOX_SELECTION;
/** All system mailboxes for an account */
private static final String SYSTEM_MAILBOX_SELECTION = ALL_MAILBOX_SELECTION +
" AND " + MailboxColumns.TYPE + "!=" + Mailbox.TYPE_MAIL;
/** All mailboxes with the given parent */
private static final String MAILBOX_SELECTION_WITH_PARENT = ALL_MAILBOX_SELECTION +
" AND " + MailboxColumns.PARENT_KEY + "=?";
private static final String USER_MAILBOX_SELECTION_WITH_PARENT = ALL_MAILBOX_SELECTION +
" AND " + MailboxColumns.PARENT_KEY + "=?" +
" AND " + MailboxColumns.TYPE + "=" + Mailbox.TYPE_MAIL;
/** Selection for a specific mailbox */
private static final String MAILBOX_SELECTION = MailboxColumns.ACCOUNT_KEY + "=?" +
" AND " + MailboxColumns.ID + "=?";
@ -533,7 +540,7 @@ class MailboxFragmentAdapter extends CursorAdapter {
(parentKey != Mailbox.NO_MAILBOX)
? SUBMAILBOX_PROJECTION
: PROJECTION,
MAILBOX_SELECTION_WITH_PARENT,
USER_MAILBOX_SELECTION_WITH_PARENT,
new String[] { Long.toString(accountId), Long.toString(parentKey) },
MAILBOX_ORDER_BY);
mContext = context;
@ -552,10 +559,10 @@ class MailboxFragmentAdapter extends CursorAdapter {
public Cursor loadInBackground() {
boolean parentRemoved = false;
final Cursor childMailboxCursor = super.loadInBackground();
final Cursor userMailboxCursor = super.loadInBackground();
final Cursor returnCursor;
final int childCount = childMailboxCursor.getCount();
final int childCount = userMailboxCursor.getCount();
if (mParentKey != Mailbox.NO_MAILBOX) {
// If we're not showing the top level mailboxes, add the "parent" mailbox.
@ -563,10 +570,38 @@ class MailboxFragmentAdapter extends CursorAdapter {
Mailbox.CONTENT_URI, CURMAILBOX_PROJECTION, MAILBOX_SELECTION,
new String[] { Long.toString(mAccountId), Long.toString(mParentKey) },
null);
returnCursor = new MergeCursor(new Cursor[] { parentCursor, childMailboxCursor });
returnCursor = new MergeCursor(new Cursor[] { parentCursor, userMailboxCursor });
} else {
// TODO Add per-account starred mailbox support
final MatrixCursor starredCursor = new MatrixCursor(MATRIX_PROJECTION);
final Cursor systemMailboxCursor = mContext.getContentResolver().query(
Mailbox.CONTENT_URI, PROJECTION, SYSTEM_MAILBOX_SELECTION,
new String[] { Long.toString(mAccountId) }, MAILBOX_ORDER_BY);
final MatrixCursor recentCursor = new MatrixCursor(MATRIX_PROJECTION);
final MatrixCursor headerCursor = new MatrixCursor(MATRIX_PROJECTION);
if (childCount > 0) {
final String name = mContext.getString(R.string.mailbox_list_user_mailboxes);
addMailboxRow(headerCursor, 0L, name, 0, 0, 0, ROW_TYPE_HEADER, 0, 0L);
}
ArrayList<Long> recentList =
RecentMailboxManager.getInstance(mContext).getMostRecent(mAccountId, true);
if (recentList.size() > 0) {
final String name = mContext.getString(R.string.mailbox_list_recent_mailboxes);
addMailboxRow(recentCursor, 0L, name, 0, 0, 0, ROW_TYPE_HEADER, 0, 0L);
for (long mailboxId : recentList) {
final Mailbox mailbox = Mailbox.restoreMailboxWithId(mContext, mailboxId);
if (mailbox == null) continue;
final int messageCount = Utility.getFirstRowInt(mContext,
ContentUris.withAppendedId(Mailbox.CONTENT_URI, mailboxId),
new String[] { MailboxColumns.MESSAGE_COUNT }, null, null, null, 0);
final int unreadCount = Utility.getFirstRowInt(mContext,
ContentUris.withAppendedId(Mailbox.CONTENT_URI, mailboxId),
new String[] { MailboxColumns.UNREAD_COUNT }, null, null, null, 0);
addMailboxRow(recentCursor, mailboxId, mailbox.mDisplayName, mailbox.mType,
unreadCount, messageCount, ROW_TYPE_MAILBOX, mailbox.mFlags,
mailbox.mAccountKey);
}
}
int accountStarredCount = Message.getFavoriteMessageCount(mContext, mAccountId);
if (accountStarredCount > 0) {
// Only add "Starred", if there is at least one starred message
@ -574,10 +609,11 @@ class MailboxFragmentAdapter extends CursorAdapter {
addCombinedMailboxRow(starredCursor, Mailbox.QUERY_ALL_FAVORITES,
Mailbox.TYPE_MAIL, totalStarredCount, true);
}
returnCursor = new MergeCursor(new Cursor[] { starredCursor, childMailboxCursor });
returnCursor = new MergeCursor(new Cursor[] {
starredCursor, systemMailboxCursor, recentCursor, headerCursor,
userMailboxCursor, });
}
return new CursorWithExtras(Utility.CloseTraceCursorWrapper.get(returnCursor),
childCount);
return new CursorWithExtras(returnCursor, childCount);
}
}
@ -617,7 +653,7 @@ class MailboxFragmentAdapter extends CursorAdapter {
unreadCount, unreadCount, ROW_TYPE_ACCOUNT, Mailbox.FLAG_NONE,
accountId);
}
return Utility.CloseTraceCursorWrapper.get(returnCursor);
return returnCursor;
}
@VisibleForTesting

18
src/com/android/email/activity/MailboxListFragment.java
View File

@ -470,22 +470,6 @@ public class MailboxListFragment extends ListFragment implements OnItemClickList
mCallback = (callback == null) ? EmptyCallback.INSTANCE : callback;
}
/**
* Returns whether or not the specified mailbox can be navigated to.
*/
private boolean isNavigable(long mailboxId) {
final ListView lv = getListView();
final int count = lv.getCount();
for (int i = 0; i < count; i++) {
final MailboxListItem item = (MailboxListItem) lv.getChildAt(i);
if (item.mMailboxId != mailboxId) {
continue;
}
return item.isNavigable();
}
return false;
}
/**
* Called when the Fragment is visible to the user.
*/
@ -884,7 +868,7 @@ public class MailboxListFragment extends ListFragment implements OnItemClickList
// from getAccountId(). (Currently "Starred" does so.)
final long accountId = mListAdapter.getAccountId(position);
boolean nestedNavigation = false;
if (isNavigable(id) && (id != mParentMailboxId)) {
if (((MailboxListItem) view).isNavigable() && (id != mParentMailboxId)) {
// Drill-in. Selected one will be the next parent, and it'll also be highlighted.
startLoading(id, id);
nestedNavigation = true;