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

Don't show "mailbox not found" toast on "back"

Browse Source 
* We'll only show this on a first load of the
  MessageListFragment

Bug: 5396997
Change-Id: I9a93bfd6e2c31d1ed8f75f1ec486da060712dffd
This commit is contained in:
Marc Blank 2011-10-11 11:10:18 -07:00
parent dbd2aeda76
commit d9cdd88702
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/email/activity/MessageListFragment.java
View File

@ -165,7 +165,7 @@ public class MessageListFragment extends ListFragment
/**
* Called when the specified mailbox does not exist.
*/
public void onMailboxNotFound();
public void onMailboxNotFound(boolean firstLoad);
/**
* Called when the user wants to open a message.
@ -206,7 +206,7 @@ public class MessageListFragment extends ListFragment
public static final Callback INSTANCE = new EmptyCallback();
@Override
public void onMailboxNotFound() {
public void onMailboxNotFound(boolean isFirstLoad) {
}
@Override
@ -1301,7 +1301,7 @@ public class MessageListFragment extends ListFragment
mListAdapter.swapCursor(cursor);
if (!cursor.mIsFound) {
mCallback.onMailboxNotFound();
mCallback.onMailboxNotFound(mIsFirstLoad);
return;
}

8
src/com/android/email/activity/UIControllerBase.java
View File

@ -902,10 +902,14 @@ abstract class UIControllerBase implements MailboxListFragment.Callback,
// MessageListFragment.Callback
@Override
public void onMailboxNotFound() {
public void onMailboxNotFound(boolean isFirstLoad) {
// Something bad happened - the account or mailbox we were looking for was deleted.
// Just restart and let the entry flow find a good default view.
Utility.showToast(mActivity, R.string.toast_mailbox_not_found);
if (isFirstLoad) {
// Only show this if it's the first load (e.g. a shortcut) rather an a return to
// a mailbox (which might be in a just-deleted account)
Utility.showToast(mActivity, R.string.toast_mailbox_not_found);
}
long accountId = getUIAccountId();
if (accountId != Account.NO_ACCOUNT) {
mActivity.startActivity(Welcome.createOpenAccountInboxIntent(mActivity, accountId));