SetupWizard: Use GMS AccountManager as intended (b990a954) · Commits · e / os / android_packages_apps_SetupWizard

src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java

+20 −38

Original line number	Diff line number	Diff line
		@@ -80,39 +80,22 @@ public class GmsAccountPage extends SetupPage {
		}

		public void launchGmsAccountSetup(final Activity activity) {
		/*
		* XXX: The AccountIntro intent is now public and therefore likely to change.
		* The only way to catch whether the user pressed skip of back if via
		* startActivityForResult.
		*
		* If this fails, fall back to the old method, but it is not ideal because only a
		* OperationCanceledException is thrown regardless of skipping or pressing back.
		*/
		try {
		Intent intent = new Intent("com.google.android.accounts.AccountIntro");
		intent.putExtra(SetupWizardApp.EXTRA_FIRST_RUN, true);
		intent.putExtra(SetupWizardApp.EXTRA_ALLOW_SKIP, true);
		intent.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true);
		activity.startActivityForResult(intent, SetupWizardApp.REQUEST_CODE_SETUP_GMS);
		} catch (Exception e) {
		Bundle bundle = new Bundle();
		bundle.putBoolean(SetupWizardApp.EXTRA_FIRST_RUN, true);
		bundle.putBoolean(SetupWizardApp.EXTRA_ALLOW_SKIP, true);
		bundle.putBoolean(SetupWizardApp.EXTRA_USE_IMMERSIVE, true);
		AccountManager
		.get(activity).addAccount(SetupWizardApp.ACCOUNT_TYPE_GMS, null, null,
		bundle, activity, new AccountManagerCallback<Bundle>() {
		bundle, null, new AccountManagerCallback<Bundle>() {
		@Override
		public void run(AccountManagerFuture<Bundle> bundleAccountManagerFuture) {
		public void run(AccountManagerFuture<Bundle> future) {
		try {
		if (bundleAccountManagerFuture.getResult()
		.getString(AccountManager.KEY_AUTHTOKEN) != null) {
		setCompleted(true);
		}
		Bundle result = future.getResult();
		Intent intent = result
		.getParcelable(AccountManager.KEY_INTENT);
		activity.startActivityForResult(intent,
		SetupWizardApp.REQUEST_CODE_SETUP_GMS);
		} catch (OperationCanceledException e) {
		if (activity != null && activity.isResumed()) {
		getCallbacks().onNextPage();
		}
		} catch (IOException e) {
		} catch (AuthenticatorException e) {
		}
		@@ -120,4 +103,3 @@ public class GmsAccountPage extends SetupPage {
		}, null);
		}
		}
		}