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

Factor out the guts of setupAccountManagerAccount()

Browse Source 
The new function will be called by the old function but it also allows
me to use it from the Migration code.

Change-Id: If9b2ad82479d60c63e8924d42fb6ce18d7d9a2f8
This commit is contained in:
Anthony Lee 2014-07-24 13:28:26 -07:00
parent a0389a26b8
commit 20110e6288
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/email/service/EmailServiceUtils.java
View File

@ -284,19 +284,38 @@ public class EmailServiceUtils {
public static AccountManagerFuture<Bundle> setupAccountManagerAccount(final Context context, public static AccountManagerFuture<Bundle> setupAccountManagerAccount(final Context context,
final Account account, final boolean email, final boolean calendar, final Account account, final boolean email, final boolean calendar,
final boolean contacts, final AccountManagerCallback<Bundle> callback) { final boolean contacts, final AccountManagerCallback<Bundle> callback) {
final Bundle options = new Bundle(5);
final HostAuth hostAuthRecv = final HostAuth hostAuthRecv =
HostAuth.restoreHostAuthWithId(context, account.mHostAuthKeyRecv); HostAuth.restoreHostAuthWithId(context, account.mHostAuthKeyRecv);
if (hostAuthRecv == null) { return setupAccountManagerAccount(context, account, email, calendar, contacts,
hostAuthRecv, callback);
}
/**
* Add an account to the AccountManager.
* @param context Our {@link Context}.
* @param account The {@link Account} we're adding.
* @param email Whether the user wants to sync email on this account.
* @param calendar Whether the user wants to sync calendar on this account.
* @param contacts Whether the user wants to sync contacts on this account.
* @param hostAuth HostAuth that identifies the protocol and password for this account.
* @param callback A callback for when the AccountManager is done.
* @return The result of {@link AccountManager#addAccount}.
*/
public static AccountManagerFuture<Bundle> setupAccountManagerAccount(final Context context,
final Account account, final boolean email, final boolean calendar,
final boolean contacts, final HostAuth hostAuth,
final AccountManagerCallback<Bundle> callback) {
if (hostAuth == null) {
return null; return null;
} }
// Set up username/password // Set up username/password
final Bundle options = new Bundle(5);
options.putString(EasAuthenticatorService.OPTIONS_USERNAME, account.mEmailAddress); options.putString(EasAuthenticatorService.OPTIONS_USERNAME, account.mEmailAddress);
options.putString(EasAuthenticatorService.OPTIONS_PASSWORD, hostAuthRecv.mPassword); options.putString(EasAuthenticatorService.OPTIONS_PASSWORD, hostAuth.mPassword);
options.putBoolean(EasAuthenticatorService.OPTIONS_CONTACTS_SYNC_ENABLED, contacts); options.putBoolean(EasAuthenticatorService.OPTIONS_CONTACTS_SYNC_ENABLED, contacts);
options.putBoolean(EasAuthenticatorService.OPTIONS_CALENDAR_SYNC_ENABLED, calendar); options.putBoolean(EasAuthenticatorService.OPTIONS_CALENDAR_SYNC_ENABLED, calendar);
options.putBoolean(EasAuthenticatorService.OPTIONS_EMAIL_SYNC_ENABLED, email); options.putBoolean(EasAuthenticatorService.OPTIONS_EMAIL_SYNC_ENABLED, email);
final EmailServiceInfo info = getServiceInfo(context, hostAuthRecv.mProtocol); final EmailServiceInfo info = getServiceInfo(context, hostAuth.mProtocol);
return AccountManager.get(context).addAccount(info.accountType, null, null, options, null, return AccountManager.get(context).addAccount(info.accountType, null, null, options, null,
callback, null); callback, null);
} }