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

Merge change 20277

Browse Source 
* changes:
  Initial support for Exchange account creation via AccountManager
This commit is contained in:
Android (Google) Code Review 2009-08-06 12:51:30 -07:00
commit 17d86bb529
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -49,9 +49,11 @@
</intent-filter>
</activity>
<!-- Must be exported in order for the AccountManager to launch it -->
<activity
android:name=".activity.setup.AccountSetupBasics"
android:label="@string/account_setup_basics_title"
android:exported="true"
>
</activity>
<activity

35
src/com/android/email/service/EasAuthenticatorService.java
View File

@ -16,6 +16,7 @@
package com.android.email.service;
import com.android.email.activity.setup.AccountSetupBasics;
import com.android.exchange.Eas;
import android.accounts.AbstractAccountAuthenticator;
@ -48,14 +49,32 @@ public class EasAuthenticatorService extends Service {
public Bundle addAccount(AccountAuthenticatorResponse response, String accountType,
String authTokenType, String[] requiredFeatures, Bundle options)
throws NetworkErrorException {
// The Bundle we are passed has username and password set
AccountManager.get(EasAuthenticatorService.this).blockingAddAccountExplicitly(
new Account(options.getString(OPTIONS_USERNAME), Eas.ACCOUNT_MANAGER_TYPE),
options.getString(OPTIONS_PASSWORD), null);
Bundle b = new Bundle();
b.putString(Constants.ACCOUNT_NAME_KEY, options.getString("username"));
b.putString(Constants.ACCOUNT_TYPE_KEY, Eas.ACCOUNT_MANAGER_TYPE);
return b;
// There are two cases here:
// 1) We are called with a username/password; this comes from the traditional email
// app UI; we simply create the account and return the proper bundle
if (options != null && options.containsKey(OPTIONS_PASSWORD)
&& options.containsKey(OPTIONS_USERNAME)) {
AccountManager.get(EasAuthenticatorService.this).blockingAddAccountExplicitly(
new Account(options.getString(OPTIONS_USERNAME), Eas.ACCOUNT_MANAGER_TYPE),
options.getString(OPTIONS_PASSWORD), null);
Bundle b = new Bundle();
b.putString(Constants.ACCOUNT_NAME_KEY, options.getString(OPTIONS_USERNAME));
b.putString(Constants.ACCOUNT_TYPE_KEY, Eas.ACCOUNT_MANAGER_TYPE);
return b;
// 2) The other case is that we're creating a new account from an Account manager
// activity. In this case, we add an intent that will be used to gather the
// account information...
} else {
Bundle b = new Bundle();
Intent intent =
new Intent(EasAuthenticatorService.this, AccountSetupBasics.class);
// Add extras that indicate this is an Exchange account creation
// So we'll skip the "account type" activity, and we'll use the response when
// we're done
intent.putExtra(Constants.ACCOUNT_AUTHENTICATOR_RESPONSE_KEY, response);
b.putParcelable(Constants.INTENT_KEY, intent);
return b;
}
}
@Override

6
src/com/android/exchange/SyncManager.java
View File

@ -455,7 +455,8 @@ public class SyncManager extends Service implements Runnable {
@Override
public void onCreate() {
if (INSTANCE != null) {
throw new RuntimeException("\n************ ALREADY RUNNING *************\n");
Log.d(TAG, "onCreate called on running SyncManager");
return;
}
INSTANCE = this;
@ -480,9 +481,6 @@ public class SyncManager extends Service implements Runnable {
MailboxColumns.TYPE + "=?",
new String[] {Long.toString(accountId),
Long.toString(Mailbox.TYPE_EAS_ACCOUNT_MAILBOX)}, null);
//sCallbackProxy.syncMailboxListStatus(accountId, EmailServiceStatus.IN_PROGRESS, 0);
//sCallbackProxy.syncMailboxListStatus(accountId, EmailServiceStatus.SUCCESS, 0);
// TODO Remove previous two lines; reimplement what's below (this is bug #2026451)
try {
if (c.moveToFirst()) {
synchronized(mSyncToken) {