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

am f9890942: am 383b7dd2: Merge "Final cleanup for account provisioning failures" into froyo

Browse Source 
Merge commit 'f9890942bc4a61d14d65f38a16a8bb53bc979880' into kraken

* commit 'f9890942bc4a61d14d65f38a16a8bb53bc979880':
  Final cleanup for account provisioning failures
This commit is contained in:
Andrew Stadler 2010-04-14 12:10:15 -07:00 committed by Android Git Automerger
commit e2be72d390
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1095,6 +1095,7 @@ 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
@ -1430,11 +1431,23 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
// These are 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) {
// no updateBanner here, we are only listing a single mailbox
// 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;
}
}
updateProgress(result, progress);
if (progress == 100) {
mHandler.lookupMailboxType(accountKey, mWaitForMailboxType);