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

Rely on the fact that display name won't be empty 

Change-Id: Ifd17daac472c1d439ddc4bd8e6811bb13a9018fa
This commit is contained in:
Makoto Onuki 2010-09-28 11:29:59 -07:00
parent 9ffb4fa0ec
commit c3b3b7a0a3
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/email/activity/AccountSelectorAdapter.java
View File

@ -40,13 +40,11 @@ import android.widget.TextView;
public class AccountSelectorAdapter extends CursorAdapter {
private static final String[] PROJECTION = new String[] {
EmailContent.RECORD_ID,
EmailContent.Account.DISPLAY_NAME,
EmailContent.Account.EMAIL_ADDRESS
EmailContent.Account.DISPLAY_NAME
};
private static final int ID_COLUMN = 0;
private static final int DISPLAY_NAME_COLUMN = 1;
private static final int EMAIL_ADDRESS_COLUMN = 2;
/** Sort order. Show the default account first. */
private static final String ORDER_BY =
@ -95,10 +93,6 @@ public class AccountSelectorAdapter extends CursorAdapter {
/** @return Account name extracted from a Cursor. */
public static String getAccountDisplayName(Cursor cursor) {
final String displayName = cursor.getString(DISPLAY_NAME_COLUMN);
if (!TextUtils.isEmpty(displayName)) {
return displayName;
}
return cursor.getString(EMAIL_ADDRESS_COLUMN);
return cursor.getString(DISPLAY_NAME_COLUMN);
}
}