Commit 51809e4c authored by Christopher Lane's avatar Christopher Lane
Browse files

Fix failure logic in add account activity

Bug: 17756080
Change-Id: I460db397b39ccc858b25b252624fa452b0cbb206
parent 060cc166
......@@ -68,16 +68,20 @@ public class AddAccountWithTypeActivity extends Activity {
super.onCreate(savedInstanceState);
String accountType = getIntent().getStringExtra(AccountManager.KEY_ACCOUNT_TYPE);
if (accountType != null) {
mLaunchAccountTypePicker = false;
startAddAccount(accountType);
} else {
mLaunchAccountTypePicker = true;
startAccountTypePicker();
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (Activity.RESULT_CANCELED == resultCode) {
setResult(resultCode);
finish();
return;
}
switch (requestCode) {
case REQUEST_ADD_ACCOUNT:
if (resultCode == Activity.RESULT_OK) {
......@@ -101,11 +105,13 @@ public class AddAccountWithTypeActivity extends Activity {
}
private void startAccountTypePicker() {
mLaunchAccountTypePicker = true;
Intent i = new Intent(CHOOSE_ACCOUNT_TYPE_ACTION);
startActivityForResult(i, REQUEST_CHOOSE_ACCOUNT_TYPE);
}
private void startAddAccount(String accountType) {
mLaunchAccountTypePicker = false;
AccountManager.get(this).addAccount(
accountType,
null, /* authTokenType */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment