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

Merge "Notify combined account when individual accounts change" into jb-ub-mail-ur10

Browse Source
This commit is contained in:
Tony Mantler 2013-09-11 16:21:34 +00:00 committed by Android (Google) Code Review
commit 2bae64df29
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/email/provider/EmailProvider.java
View File

@ -3233,6 +3233,10 @@ public class EmailProvider extends ContentProvider {
mc.addRow(row); mc.addRow(row);
row = getVirtualMailboxRow(COMBINED_ACCOUNT_ID, Mailbox.TYPE_UNREAD); row = getVirtualMailboxRow(COMBINED_ACCOUNT_ID, Mailbox.TYPE_UNREAD);
mc.addRow(row); mc.addRow(row);
final Uri notifyUri =
UIPROVIDER_FOLDERLIST_NOTIFIER.buildUpon().appendEncodedPath(id).build();
mc.setNotificationUri(context.getContentResolver(), notifyUri);
return mc; return mc;
} else { } else {
Cursor c = db.rawQuery(genQueryAccountMailboxes(uiProjection), new String[] {id}); Cursor c = db.rawQuery(genQueryAccountMailboxes(uiProjection), new String[] {id});
@ -3702,6 +3706,7 @@ public class EmailProvider extends ContentProvider {
mailboxId = Long.parseLong(id); mailboxId = Long.parseLong(id);
if (isVirtualMailbox(mailboxId)) { if (isVirtualMailbox(mailboxId)) {
c = getVirtualMailboxCursor(mailboxId); c = getVirtualMailboxCursor(mailboxId);
notifyUri = UIPROVIDER_FOLDER_NOTIFIER.buildUpon().appendPath(id).build();
} else { } else {
c = db.rawQuery(genQueryMailbox(uiProjection, id), new String[]{id}); c = db.rawQuery(genQueryMailbox(uiProjection, id), new String[]{id});
final List<String> projectionList = Arrays.asList(uiProjection); final List<String> projectionList = Arrays.asList(uiProjection);
@ -4517,6 +4522,12 @@ public class EmailProvider extends ContentProvider {
if (accountId != Account.NO_ACCOUNT) { if (accountId != Account.NO_ACCOUNT) {
notifyUI(UIPROVIDER_FOLDERLIST_NOTIFIER, accountId); notifyUI(UIPROVIDER_FOLDERLIST_NOTIFIER, accountId);
} }
// Notify for combined account too
// TODO: might be nice to only notify when an inbox changes
notifyUI(UIPROVIDER_FOLDER_NOTIFIER,
getVirtualMailboxId(COMBINED_ACCOUNT_ID, Mailbox.TYPE_INBOX));
notifyUI(UIPROVIDER_FOLDERLIST_NOTIFIER, COMBINED_ACCOUNT_ID);
} }
private void notifyUIFolder(final long folderId, final long accountId) { private void notifyUIFolder(final long folderId, final long accountId) {