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

Support accountUri in Conversation cursor

Browse Source 
Change-Id: Id1aa66df782a8ed1fb3d407a1d0a5f7b0eb5cf34
This commit is contained in:
Marc Blank 2012-05-25 13:05:44 -07:00
parent 28d2fb96f1
commit f4a1f8e6bd
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
email2/src/com/android/email/provider/EmailProvider.java
View File

@ -2044,6 +2044,9 @@ outer:
"'content://" + EmailContent.AUTHORITY + "/uifolder/' || " "'content://" + EmailContent.AUTHORITY + "/uifolder/' || "
+ MessageColumns.MAILBOX_KEY) + MessageColumns.MAILBOX_KEY)
.add(UIProvider.ConversationColumns.FLAGS, CONVERSATION_FLAGS) .add(UIProvider.ConversationColumns.FLAGS, CONVERSATION_FLAGS)
.add(UIProvider.ConversationColumns.ACCOUNT_URI,
"'content://" + EmailContent.AUTHORITY + "/uiaccount/' || "
+ MessageColumns.ACCOUNT_KEY)
.build(); .build();
/** /**
@ -2499,6 +2502,11 @@ outer:
UIProvider.FolderCapabilities.CAN_HOLD_MAIL | UIProvider.FolderCapabilities.CAN_HOLD_MAIL |
UIProvider.FolderCapabilities.DELETE_ACTION_FINAL); UIProvider.FolderCapabilities.DELETE_ACTION_FINAL);
} }
if (isVirtualMailbox(mailboxId)) {
int capa = values.getAsInteger(UIProvider.FolderColumns.CAPABILITIES);
values.put(UIProvider.FolderColumns.CAPABILITIES,
capa | UIProvider.FolderCapabilities.IS_VIRTUAL);
}
} }
StringBuilder sb = genSelect(sFolderListMap, uiProjection, values); StringBuilder sb = genSelect(sFolderListMap, uiProjection, values);
sb.append(" FROM " + Mailbox.TABLE_NAME + " WHERE " + MailboxColumns.ID + "=?"); sb.append(" FROM " + Mailbox.TABLE_NAME + " WHERE " + MailboxColumns.ID + "=?");
@ -2753,7 +2761,7 @@ outer:
values[UIProvider.FOLDER_URI_COLUMN] = combinedUriString("uifolder", idString); values[UIProvider.FOLDER_URI_COLUMN] = combinedUriString("uifolder", idString);
values[UIProvider.FOLDER_NAME_COLUMN] = getMailboxNameForType(mailboxType); values[UIProvider.FOLDER_NAME_COLUMN] = getMailboxNameForType(mailboxType);
values[UIProvider.FOLDER_HAS_CHILDREN_COLUMN] = 0; values[UIProvider.FOLDER_HAS_CHILDREN_COLUMN] = 0;
values[UIProvider.FOLDER_CAPABILITIES_COLUMN] = 0; values[UIProvider.FOLDER_CAPABILITIES_COLUMN] = UIProvider.FolderCapabilities.IS_VIRTUAL;
values[UIProvider.FOLDER_CONVERSATION_LIST_URI_COLUMN] = combinedUriString("uimessages", values[UIProvider.FOLDER_CONVERSATION_LIST_URI_COLUMN] = combinedUriString("uimessages",
idString); idString);
values[UIProvider.FOLDER_ID_COLUMN] = 0; values[UIProvider.FOLDER_ID_COLUMN] = 0;