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

Merge change 22829 into eclair

Browse Source 
* changes:
  Fix #2081145 (Empty subject line imitates magic eight ball)
This commit is contained in:
Android (Google) Code Review 2009-08-26 16:37:56 -07:00
commit 6c99ea3d02
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/com/android/email/activity/MessageList.java
View File

@ -72,7 +72,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
private static final String EXTRA_ACCOUNT_ID = "com.android.email.activity._ACCOUNT_ID"; private static final String EXTRA_ACCOUNT_ID = "com.android.email.activity._ACCOUNT_ID";
private static final String EXTRA_MAILBOX_TYPE = "com.android.email.activity.MAILBOX_TYPE"; private static final String EXTRA_MAILBOX_TYPE = "com.android.email.activity.MAILBOX_TYPE";
private static final String EXTRA_MAILBOX_ID = "com.android.email.activity.MAILBOX_ID"; private static final String EXTRA_MAILBOX_ID = "com.android.email.activity.MAILBOX_ID";
// UI support // UI support
private ListView mListView; private ListView mListView;
private View mMultiSelectPanel; private View mMultiSelectPanel;
@ -148,10 +148,10 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
/** /**
* Open a specific mailbox. * Open a specific mailbox.
* *
* TODO This should just shortcut to a more generic version that can accept a list of * TODO This should just shortcut to a more generic version that can accept a list of
* accounts/mailboxes (e.g. merged inboxes). * accounts/mailboxes (e.g. merged inboxes).
* *
* @param context * @param context
* @param id mailbox key * @param id mailbox key
*/ */
@ -163,7 +163,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
/** /**
* Open a specific mailbox by account & type * Open a specific mailbox by account & type
* *
* @param context The caller's context (for generating an intent) * @param context The caller's context (for generating an intent)
* @param accountId The account to open * @param accountId The account to open
* @param mailboxType the type of mailbox to open (e.g. @see EmailContent.Mailbox.TYPE_INBOX) * @param mailboxType the type of mailbox to open (e.g. @see EmailContent.Mailbox.TYPE_INBOX)
@ -178,7 +178,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
/** /**
* Return an intent to open a specific mailbox by account & type. It will also clear * Return an intent to open a specific mailbox by account & type. It will also clear
* notifications. * notifications.
* *
* @param context The caller's context (for generating an intent) * @param context The caller's context (for generating an intent)
* @param accountId The account to open, or -1 * @param accountId The account to open, or -1
* @param mailboxId the ID of the mailbox to open, or -1 * @param mailboxId the ID of the mailbox to open, or -1
@ -345,7 +345,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
break; break;
} }
} }
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu); super.onCreateOptionsMenu(menu);
@ -356,7 +356,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
} }
return true; return true;
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
@ -541,7 +541,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
/** /**
* Toggles a set read/unread states. Note, the default behavior is "mark unread", so the * Toggles a set read/unread states. Note, the default behavior is "mark unread", so the
* sense of the helper methods is "true=unread". * sense of the helper methods is "true=unread".
* *
* @param selectedSet The current list of selected items * @param selectedSet The current list of selected items
*/ */
private void onMultiToggleRead(Set<Long> selectedSet) { private void onMultiToggleRead(Set<Long> selectedSet) {
@ -564,7 +564,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
/** /**
* Toggles a set of favorites (stars) * Toggles a set of favorites (stars)
* *
* @param selectedSet The current list of selected items * @param selectedSet The current list of selected items
*/ */
private void onMultiToggleFavorite(Set<Long> selectedSet) { private void onMultiToggleFavorite(Set<Long> selectedSet) {
@ -620,7 +620,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
/** /**
* Toggle multiple fields in a message, using the following logic: If one or more fields * Toggle multiple fields in a message, using the following logic: If one or more fields
* are "clear", then "set" them. If all fields are "set", then "clear" them all. * are "clear", then "set" them. If all fields are "set", then "clear" them all.
* *
* @param selectedSet the set of messages that are selected * @param selectedSet the set of messages that are selected
* @param helper functions to implement the specific getter & setter * @param helper functions to implement the specific getter & setter
* @return the number of messages that were updated * @return the number of messages that were updated
@ -714,7 +714,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
* Any push-mode account: refresh * Any push-mode account: refresh
* Any non-push-mode account: load more * Any non-push-mode account: load more
* Any outbox (send again): * Any outbox (send again):
* *
* @param mailboxId the ID of the mailbox * @param mailboxId the ID of the mailbox
*/ */
private void addFooterView(long mailboxId, long accountId, int mailboxType) { private void addFooterView(long mailboxId, long accountId, int mailboxType) {
@ -856,14 +856,14 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
/** /**
* Async task for finding a single mailbox by type (possibly even going to the network). * Async task for finding a single mailbox by type (possibly even going to the network).
* *
* This is much too complex, as implemented. It uses this AsyncTask to check for a mailbox, * This is much too complex, as implemented. It uses this AsyncTask to check for a mailbox,
* then (if not found) a Controller call to refresh mailboxes from the server, and a handler * then (if not found) a Controller call to refresh mailboxes from the server, and a handler
* to relaunch this task (a 2nd time) to read the results of the network refresh. The core * to relaunch this task (a 2nd time) to read the results of the network refresh. The core
* problem is that we have two different non-UI-thread jobs (reading DB and reading network) * problem is that we have two different non-UI-thread jobs (reading DB and reading network)
* and two different paradigms for dealing with them. Some unification would be needed here * and two different paradigms for dealing with them. Some unification would be needed here
* to make this cleaner. * to make this cleaner.
* *
* TODO: If this problem spreads to other operations, find a cleaner way to handle it. * TODO: If this problem spreads to other operations, find a cleaner way to handle it.
*/ */
private class FindMailboxTask extends AsyncTask<Void, Void, Long> { private class FindMailboxTask extends AsyncTask<Void, Void, Long> {
@ -907,7 +907,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
/** /**
* Async task for loading a single folder out of the UI thread * Async task for loading a single folder out of the UI thread
* *
* The code here (for merged boxes) is a placeholder/hack and should be replaced. Some * The code here (for merged boxes) is a placeholder/hack and should be replaced. Some
* specific notes: * specific notes:
* TODO: Move the double query into a specialized URI that returns all inbox messages * TODO: Move the double query into a specialized URI that returns all inbox messages
@ -929,7 +929,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
@Override @Override
protected Cursor doInBackground(Void... params) { protected Cursor doInBackground(Void... params) {
String selection = String selection =
Utility.buildMailboxIdSelection(MessageList.this.mResolver, mMailboxKey); Utility.buildMailboxIdSelection(MessageList.this.mResolver, mMailboxKey);
Cursor c = MessageList.this.managedQuery( Cursor c = MessageList.this.managedQuery(
EmailContent.Message.CONTENT_URI, EmailContent.Message.CONTENT_URI,
@ -942,7 +942,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
@Override @Override
protected void onPostExecute(Cursor cursor) { protected void onPostExecute(Cursor cursor) {
MessageList.this.mListAdapter.changeCursor(cursor); MessageList.this.mListAdapter.changeCursor(cursor);
// TODO: remove this hack and only update at the right time // TODO: remove this hack and only update at the right time
if (cursor != null && cursor.getCount() == 0) { if (cursor != null && cursor.getCount() == 0) {
onRefresh(); onRefresh();
@ -1081,7 +1081,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
* Called from any thread to look for a mailbox of a specific type. This is designed * Called from any thread to look for a mailbox of a specific type. This is designed
* to be called from the Controller's MailboxList callback; It instructs the async task * to be called from the Controller's MailboxList callback; It instructs the async task
* not to recurse, in case the mailbox is not found after this. * not to recurse, in case the mailbox is not found after this.
* *
* See FindMailboxTask for more notes on this handler. * See FindMailboxTask for more notes on this handler.
*/ */
public void lookupMailboxType(long accountId, int mailboxType) { public void lookupMailboxType(long accountId, int mailboxType) {
@ -1157,7 +1157,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
* This class implements the adapter for displaying messages based on cursors. * This class implements the adapter for displaying messages based on cursors.
*/ */
/* package */ class MessageListAdapter extends CursorAdapter { /* package */ class MessageListAdapter extends CursorAdapter {
public static final int COLUMN_ID = 0; public static final int COLUMN_ID = 0;
public static final int COLUMN_MAILBOX_KEY = 1; public static final int COLUMN_MAILBOX_KEY = 1;
public static final int COLUMN_ACCOUNT_KEY = 2; public static final int COLUMN_ACCOUNT_KEY = 2;
@ -1185,7 +1185,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
private java.text.DateFormat mDateFormat; private java.text.DateFormat mDateFormat;
private java.text.DateFormat mDayFormat; private java.text.DateFormat mDayFormat;
private java.text.DateFormat mTimeFormat; private java.text.DateFormat mTimeFormat;
private HashSet<Long> mChecked = new HashSet<Long>(); private HashSet<Long> mChecked = new HashSet<Long>();
public MessageListAdapter(Context context) { public MessageListAdapter(Context context) {
@ -1199,7 +1199,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
mFavoriteIconOff = resources.getDrawable(android.R.drawable.star_off); mFavoriteIconOff = resources.getDrawable(android.R.drawable.star_off);
mSelectedIconOn = resources.getDrawable(R.drawable.btn_check_buttonless_on); mSelectedIconOn = resources.getDrawable(R.drawable.btn_check_buttonless_on);
mSelectedIconOff = resources.getDrawable(R.drawable.btn_check_buttonless_off); mSelectedIconOff = resources.getDrawable(R.drawable.btn_check_buttonless_off);
mDateFormat = android.text.format.DateFormat.getDateFormat(context); // short date mDateFormat = android.text.format.DateFormat.getDateFormat(context); // short date
mDayFormat = android.text.format.DateFormat.getDateFormat(context); // TODO: day mDayFormat = android.text.format.DateFormat.getDateFormat(context); // TODO: day
mTimeFormat = android.text.format.DateFormat.getTimeFormat(context); // 12/24 time mTimeFormat = android.text.format.DateFormat.getTimeFormat(context); // 12/24 time
@ -1232,7 +1232,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
TextView fromView = (TextView) view.findViewById(R.id.from); TextView fromView = (TextView) view.findViewById(R.id.from);
String text = cursor.getString(COLUMN_DISPLAY_NAME); String text = cursor.getString(COLUMN_DISPLAY_NAME);
if (text != null) fromView.setText(text); fromView.setText(text);
boolean hasAttachments = cursor.getInt(COLUMN_ATTACHMENTS) != 0; boolean hasAttachments = cursor.getInt(COLUMN_ATTACHMENTS) != 0;
fromView.setCompoundDrawablesWithIntrinsicBounds(null, null, fromView.setCompoundDrawablesWithIntrinsicBounds(null, null,
@ -1240,7 +1240,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
TextView subjectView = (TextView) view.findViewById(R.id.subject); TextView subjectView = (TextView) view.findViewById(R.id.subject);
text = cursor.getString(COLUMN_SUBJECT); text = cursor.getString(COLUMN_SUBJECT);
if (text != null) subjectView.setText(text); subjectView.setText(text);
// TODO ui spec suggests "time", "day", "date" - implement "day" // TODO ui spec suggests "time", "day", "date" - implement "day"
TextView dateView = (TextView) view.findViewById(R.id.date); TextView dateView = (TextView) view.findViewById(R.id.date);