зеркало из https://github.com/mozilla/gecko-dev.git
Bug 966174 - Skip straight back over Get Started when successfully setting up FxA. r=nalexander
This commit is contained in:
Родитель
4652f1b266
Коммит
c86c2f60b0
|
@ -85,15 +85,21 @@ public class FxAccountGetStartedActivity extends AccountAuthenticatorActivity {
|
|||
*/
|
||||
@Override
|
||||
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
Logger.debug(LOG_TAG, "onActivityResult: " + requestCode);
|
||||
Logger.debug(LOG_TAG, "onActivityResult: " + requestCode + ", " + resultCode);
|
||||
if (requestCode != CHILD_REQUEST_CODE) {
|
||||
super.onActivityResult(requestCode, resultCode, data);
|
||||
return;
|
||||
}
|
||||
|
||||
this.setResult(requestCode, data);
|
||||
if (data != null) {
|
||||
this.setAccountAuthenticatorResult(data.getExtras());
|
||||
|
||||
// We want to drop ourselves off the back stack if the user successfully
|
||||
// created or signed in to an account. We can easily determine this by
|
||||
// checking for the presence of response data.
|
||||
this.finish();
|
||||
}
|
||||
this.setResult(requestCode, data);
|
||||
}
|
||||
|
||||
protected void linkifyOldFirefoxLink() {
|
||||
|
|
Загрузка…
Ссылка в новой задаче