LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove GAIA string

Browse Source
This commit is contained in:
Costin Manolache
2009-09-29 18:57:40 -07:00
parent 1028accb55
commit 6c9579e709
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/Development/src/com/android/development/AccountsTester.java
View File

@@ -40,7 +40,7 @@ public class AccountsTester extends Activity implements OnAccountsUpdatedListene
private ListView mAuthenticatorsListView; private ListView mAuthenticatorsListView;
private AccountManager mAccountManager; private AccountManager mAccountManager;
private String mLongPressedAccount = null; private String mLongPressedAccount = null;
private static final String COM_GOOGLE_GAIA = "com.google.GAIA"; private static final String COM_GOOGLE = "com.google";
private AuthenticatorDescription[] mAuthenticatorDescs; private AuthenticatorDescription[] mAuthenticatorDescs;
private static final int GET_AUTH_TOKEN_DIALOG_ID = 1; private static final int GET_AUTH_TOKEN_DIALOG_ID = 1;
@@ -255,7 +255,7 @@ public class AccountsTester extends Activity implements OnAccountsUpdatedListene
@Override @Override
public boolean onContextItemSelected(MenuItem item) { public boolean onContextItemSelected(MenuItem item) {
if (item.getItemId() == R.id.accounts_tester_remove_account) { if (item.getItemId() == R.id.accounts_tester_remove_account) {
final Account account = new Account(mLongPressedAccount, COM_GOOGLE_GAIA); final Account account = new Account(mLongPressedAccount, COM_GOOGLE);
mAccountManager.removeAccount(account, new AccountManagerCallback<Boolean>() { mAccountManager.removeAccount(account, new AccountManagerCallback<Boolean>() {
public void run(AccountManagerFuture<Boolean> future) { public void run(AccountManagerFuture<Boolean> future) {
try { try {
@@ -273,7 +273,7 @@ public class AccountsTester extends Activity implements OnAccountsUpdatedListene
} else if (item.getItemId() == R.id.accounts_tester_update_credentials) { } else if (item.getItemId() == R.id.accounts_tester_update_credentials) {
showDialog(UPDATE_CREDENTIALS_DIALOG_ID); showDialog(UPDATE_CREDENTIALS_DIALOG_ID);
} else if (item.getItemId() == R.id.accounts_tester_confirm_credentials) { } else if (item.getItemId() == R.id.accounts_tester_confirm_credentials) {
mAccountManager.confirmCredentials(new Account(mLongPressedAccount, COM_GOOGLE_GAIA), mAccountManager.confirmCredentials(new Account(mLongPressedAccount, COM_GOOGLE),
AccountsTester.this, new ConfirmCredentialsCallback(), null /* handler */); AccountsTester.this, new ConfirmCredentialsCallback(), null /* handler */);
} }
return true; return true;
@@ -308,7 +308,7 @@ public class AccountsTester extends Activity implements OnAccountsUpdatedListene
} }
}; };
final Account account = new Account(mLongPressedAccount, final Account account = new Account(mLongPressedAccount,
COM_GOOGLE_GAIA); COM_GOOGLE);
if (id == GET_AUTH_TOKEN_DIALOG_ID) { if (id == GET_AUTH_TOKEN_DIALOG_ID) {
mAccountManager.getAuthToken(account, authTokenType, mAccountManager.getAuthToken(account, authTokenType,
null /* loginOptions */, AccountsTester.this, null /* loginOptions */, AccountsTester.this,
@@ -402,7 +402,7 @@ public class AccountsTester extends Activity implements OnAccountsUpdatedListene
try { try {
Bundle bundle = future.getResult(); Bundle bundle = future.getResult();
String authToken = bundle.getString(Constants.AUTHTOKEN_KEY); String authToken = bundle.getString(Constants.AUTHTOKEN_KEY);
mAccountManager.invalidateAuthToken(COM_GOOGLE_GAIA, authToken); mAccountManager.invalidateAuthToken(COM_GOOGLE, authToken);
} catch (OperationCanceledException e) { } catch (OperationCanceledException e) {
Log.d(TAG, "invalidate: interrupted while getting authToken"); Log.d(TAG, "invalidate: interrupted while getting authToken");
} catch (IOException e) { } catch (IOException e) {