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

Merge "Fix per account starred mailboxes."

This commit is contained in:
Ben Komalo 2011-10-12 19:45:12 -07:00 committed by Android (Google) Code Review
parent 172d05da23 513486cfb5
commit 223267f701
10 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
emailcommon/src/com/android/emailcommon/provider/EmailContent.java
View File

@ -965,7 +965,8 @@ public abstract class EmailContent {
*
* Accesses the detabase to determine the mailbox type. DO NOT CALL FROM UI THREAD.
*/
public static String buildMessageListSelection(Context context, long mailboxId) {
public static String buildMessageListSelection(
Context context, long accountId, long mailboxId) {
if (mailboxId == Mailbox.QUERY_ALL_INBOXES) {
return Message.ALL_INBOX_SELECTION;
@ -979,8 +980,18 @@ public abstract class EmailContent {
if (mailboxId == Mailbox.QUERY_ALL_UNREAD) {
return Message.ALL_UNREAD_SELECTION;
}
// TODO: we only support per-account starred mailbox right now, but presumably, we
// can surface the same thing for unread.
if (mailboxId == Mailbox.QUERY_ALL_FAVORITES) {
return Message.ALL_FAVORITE_SELECTION;
if (accountId == Account.ACCOUNT_ID_COMBINED_VIEW) {
return Message.ALL_FAVORITE_SELECTION;
}
final StringBuilder selection = new StringBuilder();
selection.append(MessageColumns.ACCOUNT_KEY).append('=').append(accountId)
.append(" AND ")
.append(Message.ALL_FAVORITE_SELECTION);
return selection.toString();
}
// Now it's a regular mailbox.

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

@ -865,13 +865,19 @@ public class MailboxListFragment extends ListFragment implements OnItemClickList
// the current loader and make the mListAdapter lose the cursor.
// Note, don't just use getAccountId(). A mailbox may tied to a different account ID
// from getAccountId(). (Currently "Starred" does so.)
final long accountId = mListAdapter.getAccountId(position);
long accountId = mListAdapter.getAccountId(position);
boolean nestedNavigation = false;
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;
}
if (accountId == Account.ACCOUNT_ID_COMBINED_VIEW) {
// Virtual mailboxes, such as "Starred", will have a "combined view" ID. However,
// we really want to relay the current active account, so that
// things like per-account starred mailboxes work as expected.
accountId = getAccountId();
}
mCallback.onMailboxSelected(accountId, id, nestedNavigation);
}
}

9
src/com/android/email/activity/MessageListFragment.java
View File

@ -278,7 +278,7 @@ public class MessageListFragment extends ListFragment
* @return true if the mailbox is a combined mailbox. Safe to call even before onCreate.
*/
public boolean isCombinedMailbox() {
return getMailboxId() < 0;
return getAccountId() == Account.ACCOUNT_ID_COMBINED_VIEW;
}
public MessageListContext getListContext() {
@ -1229,7 +1229,7 @@ public class MessageListFragment extends ListFragment
// Start loading...
final LoaderManager lm = getLoaderManager();
lm.initLoader(LOADER_ID_MESSAGES_LOADER, null, new MessagesLoaderCallback());
lm.initLoader(LOADER_ID_MESSAGES_LOADER, null, LOADER_CALLBACKS);
}
/** Timeout to show a warning, since some IMAP searches could take a long time. */
@ -1254,7 +1254,8 @@ public class MessageListFragment extends ListFragment
/**
* Loader callbacks for message list.
*/
private class MessagesLoaderCallback implements LoaderManager.LoaderCallbacks<Cursor> {
private final LoaderManager.LoaderCallbacks<Cursor> LOADER_CALLBACKS =
new LoaderManager.LoaderCallbacks<Cursor>() {
@Override
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
final MessageListContext listContext = getListContext();
@ -1386,7 +1387,7 @@ public class MessageListFragment extends ListFragment
mSearchedMailbox = null;
mCountTotalAccounts = 0;
}
}
};
/**
* Show/hide the "selection" action mode, according to the number of selected messages and

36
src/com/android/email/activity/MessageOrderManager.java
View File

@ -16,6 +16,14 @@
package com.android.email.activity;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.database.Cursor;
import android.os.Handler;
import com.android.email.MessageListContext;
import com.android.email.activity.MessageOrderManager.Callback;
import com.android.emailcommon.provider.EmailContent;
import com.android.emailcommon.provider.EmailContent.Message;
import com.android.emailcommon.provider.Mailbox;
@ -25,12 +33,6 @@ import com.android.emailcommon.utility.Utility;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.database.Cursor;
import android.os.Handler;
/**
* Used by {@link MessageView} to determine the message-id of the previous/next messages.
*
@ -55,7 +57,7 @@ public class MessageOrderManager {
private final Context mContext;
private final ContentResolver mContentResolver;
private final long mMailboxId;
private final MessageListContext mListContext;
private final ContentObserver mObserver;
private final Callback mCallback;
private final DelayedOperations mDelayedOperations;
@ -121,18 +123,18 @@ public class MessageOrderManager {
}
}
public MessageOrderManager(Context context, long mailboxId, Callback callback) {
this(context, mailboxId, callback, new DelayedOperations(Utility.getMainThreadHandler()));
public MessageOrderManager(Context context, MessageListContext listContext, Callback callback) {
this(context, listContext, callback, new DelayedOperations(Utility.getMainThreadHandler()));
}
@VisibleForTesting
MessageOrderManager(Context context, long mailboxId, Callback callback,
MessageOrderManager(Context context, MessageListContext listContext, Callback callback,
DelayedOperations delayedOperations) {
Preconditions.checkArgument(mailboxId != Mailbox.NO_MAILBOX);
Preconditions.checkArgument(listContext.getMailboxId() != Mailbox.NO_MAILBOX);
mContext = context.getApplicationContext();
mContentResolver = mContext.getContentResolver();
mDelayedOperations = delayedOperations;
mMailboxId = mailboxId;
mListContext = listContext;
mCallback = new PostingCallback(callback);
mObserver = new ContentObserver(getHandlerForContentObserver()) {
@Override public void onChange(boolean selfChange) {
@ -145,8 +147,12 @@ public class MessageOrderManager {
startTask();
}
public MessageListContext getListContext() {
return mListContext;
}
public long getMailboxId() {
return mMailboxId;
return mListContext.getMailboxId();
}
/**
@ -346,7 +352,9 @@ public class MessageOrderManager {
*/
private Cursor openNewCursor() {
final Cursor cursor = mContentResolver.query(EmailContent.Message.CONTENT_URI,
EmailContent.ID_PROJECTION, Message.buildMessageListSelection(mContext, mMailboxId),
EmailContent.ID_PROJECTION,
Message.buildMessageListSelection(
mContext, mListContext.mAccountId, mListContext.getMailboxId()),
null, EmailContent.MessageColumns.TIMESTAMP + " DESC");
return cursor;
}

12
src/com/android/email/activity/MessagesAdapter.java
View File

@ -275,26 +275,28 @@ import java.util.Set;
}
return listContext.isSearch()
? new SearchCursorLoader(context, listContext)
: new MessagesCursorLoader(context, listContext.getMailboxId());
: new MessagesCursorLoader(context, listContext);
}
private static class MessagesCursorLoader extends ThrottlingCursorLoader {
protected final Context mContext;
private final long mAccountId;
private final long mMailboxId;
public MessagesCursorLoader(Context context, long mailboxId) {
public MessagesCursorLoader(Context context, MessageListContext listContext) {
// Initialize with no where clause. We'll set it later.
super(context, EmailContent.Message.CONTENT_URI,
MESSAGE_PROJECTION, null, null,
EmailContent.MessageColumns.TIMESTAMP + " DESC");
mContext = context;
mMailboxId = mailboxId;
mAccountId = listContext.mAccountId;
mMailboxId = listContext.getMailboxId();
}
@Override
public Cursor loadInBackground() {
// Build the where cause (which can't be done on the UI thread.)
setSelection(Message.buildMessageListSelection(mContext, mMailboxId));
setSelection(Message.buildMessageListSelection(mContext, mAccountId, mMailboxId));
// Then do a query to get the cursor
return loadExtras(super.loadInBackground());
}
@ -376,7 +378,7 @@ import java.util.Set;
private Mailbox mSearchedMailbox = null;
public SearchCursorLoader(Context context, MessageListContext listContext) {
super(context, listContext.getMailboxId());
super(context, listContext);
Preconditions.checkArgument(listContext.isSearch());
mListContext = listContext;
}

7
src/com/android/email/activity/UIControllerBase.java
View File

@ -984,11 +984,10 @@ abstract class UIControllerBase implements MailboxListFragment.Callback,
}
Preconditions.checkNotNull(mListContext);
final long mailboxId = mListContext.getMailboxId();
if (mOrderManager == null || mOrderManager.getMailboxId() != mailboxId) {
if (mOrderManager == null || !mOrderManager.getListContext().equals(mListContext)) {
stopMessageOrderManager();
mOrderManager =
new MessageOrderManager(mActivity, mailboxId, mMessageOrderManagerCallback);
mOrderManager = new MessageOrderManager(
mActivity, mListContext, mMessageOrderManagerCallback);
}
mOrderManager.moveTo(getMessageId());
updateNavigationArrows();

5
src/com/android/email/activity/UIControllerOnePane.java
View File

@ -601,7 +601,10 @@ class UIControllerOnePane extends UIControllerBase {
// Refreshable only when an actual account is selected, and message view isn't shown.
// (i.e. only available on the mailbox list or the message view, but not on the combined
// one)
return isActualAccountSelected() && !isMessageViewInstalled();
if (!isActualAccountSelected() || isMessageViewInstalled()) {
return false;
}
return isMailboxListInstalled() || (mListContext.getMailboxId() > 0);
}
@Override

5
src/com/android/email/activity/UIControllerTwoPane.java
View File

@ -287,9 +287,8 @@ class UIControllerTwoPane extends UIControllerBase implements ThreePaneLayout.Ca
*/
@Override
protected boolean isRefreshEnabled() {
// - Don't show for combined inboxes, but
// - Show even for non-refreshable mailboxes, in which case we refresh the mailbox list
return getActualAccountId() != Account.NO_ACCOUNT;
return getActualAccountId() != Account.NO_ACCOUNT
&& (mListContext.getMailboxId() > 0);
}

17
tests/src/com/android/email/activity/MessageOrderManagerTest.java
View File

@ -16,10 +16,6 @@
package com.android.email.activity;
import com.android.email.provider.EmailProvider;
import com.android.emailcommon.provider.EmailContent;
import com.android.emailcommon.utility.DelayedOperations;
import android.content.Context;
import android.database.AbstractCursor;
import android.database.Cursor;
@ -27,6 +23,11 @@ import android.os.Handler;
import android.test.ProviderTestCase2;
import android.test.suitebuilder.annotation.SmallTest;
import com.android.email.MessageListContext;
import com.android.email.provider.EmailProvider;
import com.android.emailcommon.provider.EmailContent;
import com.android.emailcommon.utility.DelayedOperations;
import junit.framework.Assert;
@SmallTest
@ -256,7 +257,8 @@ public class MessageOrderManagerTest extends ProviderTestCase2<EmailProvider> {
public void testWithActualClass() {
// There are not many things we can test synchronously.
// Just open & close just to make sure it won't crash.
MessageOrderManager mom = new MessageOrderManager(getContext(), 1, new MyCallback());
MessageOrderManager mom = new MessageOrderManager(
getContext(), MessageListContext.forMailbox(1, 1), new MyCallback());
mom.moveTo(123);
mom.close();
}
@ -307,7 +309,8 @@ public class MessageOrderManagerTest extends ProviderTestCase2<EmailProvider> {
public boolean mStartQueryCalled;
public MessageOrderManagerForTest(Context context, long mailboxId, Callback callback) {
super(context, mailboxId, callback, new NonDelayedOperations());
super(context, MessageListContext.forMailbox(1, mailboxId),
callback, new NonDelayedOperations());
}
@Override void startQuery() {
@ -345,7 +348,7 @@ public class MessageOrderManagerTest extends ProviderTestCase2<EmailProvider> {
}
private static class MyCursor extends AbstractCursor {
private long[] mList;
private final long[] mList;
public MyCursor(long... idList) {
mList = (idList == null) ? new long[0] : idList;

32
tests/src/com/android/email/provider/ProviderTests.java
View File

@ -2298,38 +2298,6 @@ public class ProviderTests extends ProviderTestCase2<EmailProvider> {
assertEquals(b34, testMailbox);
}
public void testBuildMessageListSelection() {
final Context c = mMockContext;
assertEquals(Message.ALL_INBOX_SELECTION, Message.buildMessageListSelection(c,
Mailbox.QUERY_ALL_INBOXES));
assertEquals(Message.ALL_DRAFT_SELECTION, Message.buildMessageListSelection(c,
Mailbox.QUERY_ALL_DRAFTS));
assertEquals(Message.ALL_OUTBOX_SELECTION, Message.buildMessageListSelection(c,
Mailbox.QUERY_ALL_OUTBOX));
assertEquals(Message.ALL_UNREAD_SELECTION, Message.buildMessageListSelection(c,
Mailbox.QUERY_ALL_UNREAD));
assertEquals(Message.ALL_FAVORITE_SELECTION, Message.buildMessageListSelection(c,
Mailbox.QUERY_ALL_FAVORITES));
final Account account = ProviderTestUtils.setupAccount("1", true, mMockContext);
final Mailbox in = ProviderTestUtils.setupMailbox("i", account.mId, true, c,
Mailbox.TYPE_INBOX);
final Mailbox out = ProviderTestUtils.setupMailbox("o", account.mId, true, c,
Mailbox.TYPE_OUTBOX);
assertEquals(Message.MAILBOX_KEY + "=" + in.mId + " AND " + Message.FLAG_LOADED_SELECTION,
Message.buildMessageListSelection(c, in.mId));
// No LOADED check for outboxes.
assertEquals(Message.MAILBOX_KEY + "=" + out.mId,
Message.buildMessageListSelection(c, out.mId));
}
/**
* Determine whether a list of AccountManager accounts includes a given EmailProvider account
* @param amAccountList a list of AccountManager accounts