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

Merge "Reset state when we error out of certain actions" into ub-mail-master

This commit is contained in:
Tony Mantler 2014-03-04 17:31:52 +00:00 committed by Android (Google) Code Review
parent 47c2b02914 34eac10a11
commit 05f946e6cf
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/email/activity/setup/AccountSetupFinal.java
View File

@ -478,6 +478,16 @@ public class AccountSetupFinal extends AccountSetupActivity
return (AccountSetupFragment) getFragmentManager().findFragmentByTag(CONTENT_FRAGMENT_TAG);
}
/**
* Reads the flow state saved into the current fragment and restores mState to it, also
* resetting the headline at the same time.
*/
private void resetStateFromCurrentFragment() {
AccountSetupFragment f = getContentFragment();
mState = f.getState();
updateHeadline();
}
/**
* Main choreography function to handle moving forward through scenes. Moving back should be
* generally handled for us by the back stack
@ -613,9 +623,7 @@ public class AccountSetupFinal extends AccountSetupActivity
}
// After super.onBackPressed() our fragment should be in place, so query the state we
// installed it for
AccountSetupFragment f = getContentFragment();
mState = f.getState();
updateHeadline();
resetStateFromCurrentFragment();
}
@Override
@ -867,6 +875,8 @@ public class AccountSetupFinal extends AccountSetupActivity
if (mState == STATE_CHECKING_PRECONFIGURED) {
mPreConfiguredFailed = true;
proceed();
} else {
resetStateFromCurrentFragment();
}
final AccountSetupIncomingFragment f = (AccountSetupIncomingFragment) getContentFragment();
f.onCertificateRequested();
@ -879,6 +889,8 @@ public class AccountSetupFinal extends AccountSetupActivity
if (mState == STATE_CHECKING_PRECONFIGURED || mState == STATE_AUTO_DISCOVER) {
mPreConfiguredFailed = true;
proceed();
} else {
resetStateFromCurrentFragment();
}
}
@ -905,6 +917,8 @@ public class AccountSetupFinal extends AccountSetupActivity
public void onSecurityRequiredDialogResult(boolean ok) {
if (ok) {
proceed();
} else {
resetStateFromCurrentFragment();
}
}