Merge "Remove incorrect error reporting in MessageList" into froyo
This commit is contained in:
commit
ce592f32f9
@ -1103,7 +1103,6 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
|
||||
if (accountExists && mOkToRecurse) {
|
||||
// launch network lookup
|
||||
mControllerCallback.mWaitForMailboxType = mMailboxType;
|
||||
mControllerCallback.mWaitForMailboxAccountId = mAccountId;
|
||||
mController.updateMailboxList(mAccountId, mControllerCallback);
|
||||
} else {
|
||||
// We don't want to do the network lookup, or the account doesn't exist in the
|
||||
@ -1437,24 +1436,16 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
|
||||
// This is used to alter the connection banner operation for sending messages
|
||||
MessagingException mSendMessageException;
|
||||
|
||||
// These are preset for use by updateMailboxListCallback
|
||||
// This is preset for use by updateMailboxListCallback
|
||||
int mWaitForMailboxType = -1;
|
||||
long mWaitForMailboxAccountId = -1;
|
||||
|
||||
// TODO check accountKey and only react to relevant notifications
|
||||
public void updateMailboxListCallback(MessagingException result, long accountKey,
|
||||
int progress) {
|
||||
// Special case to show a banner here if we can't refresh the account
|
||||
if (accountKey == mWaitForMailboxAccountId) {
|
||||
// Display error
|
||||
if (result != null) {
|
||||
updateBanner(result, progress, mMailboxId);
|
||||
}
|
||||
// Reset the account watcher so we don't respond again
|
||||
if (result != null || progress == 100) {
|
||||
mWaitForMailboxAccountId = -1;
|
||||
}
|
||||
}
|
||||
// updateMailboxList is never the end goal in MessageList, so we don't show
|
||||
// these errors. There are a couple of corner cases that we miss reporting, but
|
||||
// this is better than reporting a number of non-problem intermediate states.
|
||||
// updateBanner(result, progress, mMailboxId);
|
||||
|
||||
updateProgress(result, progress);
|
||||
if (progress == 100) {
|
||||
|
Loading…
Reference in New Issue
Block a user