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

Merge "Populate the account object with the type" into jb-ub-mail-ur9

Browse Source
This commit is contained in:
Yu Ping Hu 2013-04-15 20:23:30 +00:00 committed by Android (Google) Code Review
commit d3af8adba6
1 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,7 @@ import com.android.emailcommon.provider.EmailContent.Attachment;
import com.android.emailcommon.provider.EmailContent.AttachmentColumns;
import com.android.emailcommon.provider.EmailContent.Body;
import com.android.emailcommon.provider.EmailContent.BodyColumns;
import com.android.emailcommon.provider.EmailContent.HostAuthColumns;
import com.android.emailcommon.provider.EmailContent.MailboxColumns;
import com.android.emailcommon.provider.EmailContent.Message;
import com.android.emailcommon.provider.EmailContent.MessageColumns;
@ -374,6 +375,8 @@ public class EmailProvider extends ContentProvider {
public static Uri ACCOUNT_BACKUP_URI;
private static Uri FOLDER_STATUS_URI;
private static Map<String, String> sProtocolTypeMap;
private SQLiteDatabase mDatabase;
private SQLiteDatabase mBodyDatabase;
@ -2822,6 +2825,7 @@ outer:
final long accountId = Long.parseLong(id);
final Context context = getContext();
// TODO: If uiProjection is null, this will NPE. We should do everything here if it's null.
final Set<String> projectionColumns = ImmutableSet.copyOf(uiProjection);
if (projectionColumns.contains(UIProvider.AccountColumns.CAPABILITIES)) {
@ -2916,6 +2920,31 @@ outer:
}
}
}
if (projectionColumns.contains(UIProvider.AccountColumns.TYPE)) {
final String query = "SELECT ha." + HostAuthColumns.PROTOCOL
+ " FROM " + Account.TABLE_NAME + " a INNER JOIN " + HostAuth.TABLE_NAME
+ " ha ON a." + AccountColumns.HOST_AUTH_KEY_RECV + " = ha."
+ HostAuthColumns.ID
+ " WHERE a." + AccountColumns.ID + " = ?";
final Cursor cursor = mDatabase.rawQuery(query, new String[] { id });
final String type;
if (cursor.moveToFirst()) {
loadProtocolTypeMap(context);
final String protocol = cursor.getString(0);
if (protocol != null && sProtocolTypeMap.containsKey(protocol)) {
type = sProtocolTypeMap.get(protocol);
} else {
type = "unknown";
}
} else {
type = "unknown";
}
cursor.close();
values.put(UIProvider.AccountColumns.TYPE, type);
}
final StringBuilder sb = genSelect(getAccountListMap(getContext()), uiProjection, values);
sb.append(" FROM " + Account.TABLE_NAME + " WHERE " + AccountColumns.ID + "=?");
return sb.toString();
@ -3014,7 +3043,6 @@ outer:
private void addCombinedAccountRow(MatrixCursor mc) {
final long id = Account.getDefaultAccountId(getContext());
if (id == Account.NO_ACCOUNT) return;
final String idString = Long.toString(id);
// Build a map of the requested columns to the appropriate positions
final ImmutableMap.Builder<String, Integer> builder =
@ -3041,6 +3069,9 @@ outer:
values[colPosMap.get(UIProvider.AccountColumns.NAME)] = getContext().getString(
R.string.mailbox_list_account_selector_combined_view);
}
if (colPosMap.containsKey(UIProvider.AccountColumns.TYPE)) {
values[colPosMap.get(UIProvider.AccountColumns.TYPE)] = "unknown";
}
if (colPosMap.containsKey(UIProvider.AccountColumns.UNDO_URI)) {
values[colPosMap.get(UIProvider.AccountColumns.UNDO_URI)] =
"'content://" + EmailContent.AUTHORITY + "/uiundo'";
@ -4702,4 +4733,19 @@ outer:
cursor.close();
}
}
private void loadProtocolTypeMap(final Context context) {
if (sProtocolTypeMap == null) {
final ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
builder.put(context.getString(R.string.protocol_eas),
context.getString(R.string.account_manager_type_exchange));
builder.put(context.getString(R.string.protocol_imap),
context.getString(R.string.account_manager_type_imap));
builder.put(context.getString(R.string.protocol_pop3),
context.getString(R.string.account_manager_type_pop3));
sProtocolTypeMap = builder.build();
}
}
}