Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5461)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java

Issue 1357643002: [Android]Don't check for child account/EDU device for every activity. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert SignInPreference to avoid 2 sided patch Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java
deleted file mode 100644
index 925e065b148f0b0b6d54d4ed07e23ab19492f8fd..0000000000000000000000000000000000000000
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java
+++ /dev/null
@@ -1,319 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package org.chromium.chrome.browser.firstrun;
-
-import android.accounts.Account;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.text.TextUtils;
-import android.util.Log;
-
-import org.chromium.base.CommandLine;
-import org.chromium.base.VisibleForTesting;
-import org.chromium.chrome.browser.ChromeSwitches;
-import org.chromium.chrome.browser.preferences.Preferences;
-import org.chromium.chrome.browser.preferences.PreferencesLauncher;
-import org.chromium.chrome.browser.services.AndroidEduAndChildAccountHelper;
-import org.chromium.chrome.browser.signin.SigninManager;
-import org.chromium.chrome.browser.signin.SigninManager.SignInFlowObserver;
-import org.chromium.chrome.browser.sync.ui.SyncCustomizationFragment;
-import org.chromium.chrome.browser.util.FeatureUtilities;
-import org.chromium.sync.signin.AccountManagerHelper;
-import org.chromium.sync.signin.ChromeSigninController;
-
-/**
- * A helper to perform all necessary steps for the automatic FRE sign in.
- * The helper performs:
- * - necessary Android EDU and child account checks;
- * - automatic non-interactive forced sign in for Android EDU and child accounts; and
- * - any pending automatic non-interactive request to sign in from the First Run Experience.
- * The helper calls the observer's onSignInComplete() if
- * - nothing needs to be done, or when
- * - the sign in is complete.
- * If the sign in process fails or if an interactive FRE sequence is necessary,
- * the helper starts the FRE activity, finishes the current activity and calls
- * OnSignInCancelled.
- *
- * Usage:
- * new FirstRunSignInProcessor(activity, shouldShowNotification){
- * override OnSignInComplete and OnSignInCancelled
- * }.start().
- */
-public class FirstRunSignInProcessor {
- /**
- * SharedPreferences preference names to keep the state of the First Run Experience.
- */
- private static final String FIRST_RUN_FLOW_SIGNIN_COMPLETE = "first_run_signin_complete";
- private static final String FIRST_RUN_FLOW_SIGNIN_ACCOUNT_NAME =
- "first_run_signin_account_name";
- private static final String FIRST_RUN_FLOW_SIGNIN_SETUP_SYNC = "first_run_signin_setup_sync";
-
- private final Activity mActivity;
- private final SigninManager mSignInManager;
- private final SignInFlowObserver mObserver;
- private final boolean mShowSignInNotification;
-
- private boolean mIsAndroidEduDevice;
- private boolean mHasChildAccount;
- private int mSignInType;
-
- /**
- * Initiates the automatic sign-in process in background.
- *
- * @param activity The context for the FRE parameters processor.
- */
- public static void start(Activity activity) {
- new FirstRunSignInProcessor(activity, false, null);
- }
-
- private FirstRunSignInProcessor(Activity activity, boolean showSignInNotification,
- SignInFlowObserver observer) {
- mActivity = activity;
- mSignInManager = SigninManager.get(activity);
- mObserver = observer;
- mShowSignInNotification = showSignInNotification;
-
- new AndroidEduAndChildAccountHelper() {
- @Override
- public void onParametersReady() {
- mIsAndroidEduDevice = isAndroidEduDevice();
- mHasChildAccount = hasChildAccount();
- mSignInManager.onFirstRunCheckDone();
- mSignInType = mHasChildAccount
- ? SigninManager.SIGNIN_TYPE_FORCED_CHILD_ACCOUNT
- : (mIsAndroidEduDevice
- ? SigninManager.SIGNIN_TYPE_FORCED_EDU
- : SigninManager.SIGNIN_TYPE_INTERACTIVE);
-
- // We allow to pass-through without FRE being complete only if
- // - FRE is disabled, or
- // - FRE hasn't been completed, but the user has already seen the ToS in
- // the Setup Wizard.
- boolean firstRunFlowComplete = FirstRunStatus.getFirstRunFlowComplete(mActivity);
- if (CommandLine.getInstance().hasSwitch(ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE)
- || (!firstRunFlowComplete
- && ToSAckedReceiver.checkAnyUserHasSeenToS(mActivity))) {
- mSignInManager.onFirstRunCheckDone();
- if (mObserver != null) mObserver.onSigninComplete();
- return;
- }
-
- // Otherwise, the FRE must have been completed, so let's force it.
- if (!firstRunFlowComplete) {
- requestToFireIntentAndFinish();
- return;
- }
-
- if (!getFirstRunFlowSignInComplete(mActivity)) {
- // Check if we need to complete any outstanding sign-in requests from FRE.
- // It setFirstRunFlowSignInComplete() once the sign-in is complete or if
- // it's unnecessary.
- completeFreSignInRequest();
- } else {
- processAutomaticSignIn();
- }
- }
- }.start(mActivity);
- }
-
- /**
- * Processes the fully automatic non-FRE-related forced sign-in.
- * This is used to enforce the environment for Android EDU and child accounts.
- */
- private void processAutomaticSignIn() {
- // This is only for non-interactive forced sign-ins.
- assert getFirstRunFlowSignInComplete(mActivity);
- assert !mHasChildAccount || !mIsAndroidEduDevice;
- if (!mIsAndroidEduDevice && !mHasChildAccount) return;
-
- final Account[] googleAccounts =
- AccountManagerHelper.get(mActivity).getGoogleAccounts();
- SigninManager signinManager = SigninManager.get(mActivity.getApplicationContext());
- if (!FeatureUtilities.canAllowSync(mActivity)
- || !signinManager.isSignInAllowed()
- || googleAccounts.length != 1) return;
-
- signinManager.signInToSelectedAccount(mActivity, googleAccounts[0],
- mSignInType, SigninManager.SIGNIN_SYNC_IMMEDIATELY, mShowSignInNotification,
- mObserver);
- }
-
- /**
- * Processes an outstanding FRE sign-in request if any.
- */
- private void completeFreSignInRequest() {
- // This is only for completion of the FRE sign-in process.
- assert !getFirstRunFlowSignInComplete(mActivity);
-
- final String accountName = getFirstRunFlowSignInAccountName(mActivity);
- SigninManager signinManager = SigninManager.get(mActivity.getApplicationContext());
- if (!FeatureUtilities.canAllowSync(mActivity)
- || !signinManager.isSignInAllowed()
- || TextUtils.isEmpty(accountName)) {
- setFirstRunFlowSignInComplete(mActivity, true);
- if (mObserver != null) mObserver.onSigninComplete();
- return;
- }
-
- final Account account =
- AccountManagerHelper.get(mActivity).getAccountFromName(accountName);
- if (account == null) {
- // TODO(aruslan): handle the account being removed during the FRE.
- requestToFireIntentAndFinish();
- return;
- }
-
- final boolean delaySync = getFirstRunFlowSignInSetupSync(mActivity);
- final int delaySyncType = delaySync
- ? SigninManager.SIGNIN_SYNC_SETUP_IN_PROGRESS
- : SigninManager.SIGNIN_SYNC_IMMEDIATELY;
- signinManager.signInToSelectedAccount(mActivity, account,
- mSignInType, delaySyncType, mShowSignInNotification,
- new SignInFlowObserver() {
- private void completeSignIn() {
- // Show sync settings if user pressed the "Settings" button.
- if (delaySync) {
- openSyncSettings(
- ChromeSigninController.get(mActivity).getSignedInAccountName());
- }
- setFirstRunFlowSignInComplete(mActivity, true);
- }
-
- @Override
- public void onSigninComplete() {
- completeSignIn();
- if (mObserver != null) mObserver.onSigninComplete();
- }
-
- @Override
- public void onSigninCancelled() {
- completeSignIn();
- if (mObserver != null) mObserver.onSigninCancelled();
- }
- });
- }
-
- /**
- * Opens Sync settings as requested in the FRE sign-in dialog.
- * @param accountName The account to show the sync settings for.
- */
- private void openSyncSettings(final String accountName) {
- if (TextUtils.isEmpty(accountName)) return;
- Intent intent = PreferencesLauncher.createIntentForSettingsPage(
- mActivity, SyncCustomizationFragment.class.getName());
- Bundle args = new Bundle();
- args.putString(SyncCustomizationFragment.ARGUMENT_ACCOUNT, accountName);
- intent.putExtra(Preferences.EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
- mActivity.startActivity(intent);
- }
-
- /**
- * Starts the full FRE and finishes the current activity.
- */
- private void requestToFireIntentAndFinish() {
- Log.e("FirstRunSignInProcessor", "Attempt to pass-through without completed FRE");
- if (mObserver != null) mObserver.onSigninCancelled();
-
- // Things went wrong -- we want the user to go through the full FRE.
- FirstRunStatus.setFirstRunFlowComplete(mActivity, false);
- setFirstRunFlowSignInComplete(mActivity, false);
- setFirstRunFlowSignInAccountName(mActivity, null);
- setFirstRunFlowSignInSetupSync(mActivity, false);
- mActivity.startActivity(FirstRunFlowSequencer.createGenericFirstRunIntent(
- mActivity, true));
- }
-
- /**
- * @return Whether there is no pending sign-in requests from the First Run Experience.
- * @param context A context
- */
- private static boolean getFirstRunFlowSignInComplete(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getBoolean(FIRST_RUN_FLOW_SIGNIN_COMPLETE, false);
- }
-
- /**
- * Sets the "pending First Run Experience sign-in requests" preference.
- * @param context A context
- * @param isComplete Whether there is no pending sign-in requests from the First Run Experience.
- */
- @VisibleForTesting
- public static void setFirstRunFlowSignInComplete(Context context, boolean isComplete) {
- PreferenceManager.getDefaultSharedPreferences(context)
- .edit()
- .putBoolean(FIRST_RUN_FLOW_SIGNIN_COMPLETE, isComplete)
- .apply();
- }
-
- /**
- * @return The account name selected during the First Run Experience, or null if none.
- * @param context A context
- */
- private static String getFirstRunFlowSignInAccountName(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getString(FIRST_RUN_FLOW_SIGNIN_ACCOUNT_NAME, null);
- }
-
- /**
- * Sets the account name for the pending sign-in First Run Experience request.
- * @param context A context
- * @param accountName The account name, or null.
- */
- private static void setFirstRunFlowSignInAccountName(Context context, String accountName) {
- PreferenceManager.getDefaultSharedPreferences(context)
- .edit()
- .putString(FIRST_RUN_FLOW_SIGNIN_ACCOUNT_NAME, accountName)
- .apply();
- }
-
- /**
- * @return Whether the user selected to see the Sync settings once signed in after FRE.
- * @param context A context
- */
- private static boolean getFirstRunFlowSignInSetupSync(Context context) {
- return PreferenceManager.getDefaultSharedPreferences(context)
- .getBoolean(FIRST_RUN_FLOW_SIGNIN_SETUP_SYNC, false);
- }
-
- /**
- * Sets the preference to see the Sync settings once signed in after FRE.
- * @param context A context
- * @param isComplete Whether the user selected to see the Sync settings once signed in.
- */
- private static void setFirstRunFlowSignInSetupSync(Context context, boolean isComplete) {
- PreferenceManager.getDefaultSharedPreferences(context)
- .edit()
- .putBoolean(FIRST_RUN_FLOW_SIGNIN_SETUP_SYNC, isComplete)
- .apply();
- }
-
- /**
- * Finalize the state of the FRE flow (mark is as "complete" and finalize parameters).
- * @param context A context
- * @param data Resulting FRE properties bundle
- */
- public static void finalizeFirstRunFlowState(Context context, Bundle data) {
- FirstRunStatus.setFirstRunFlowComplete(context, true);
- setFirstRunFlowSignInAccountName(context,
- data.getString(FirstRunActivity.RESULT_SIGNIN_ACCOUNT_NAME));
- setFirstRunFlowSignInSetupSync(context,
- data.getBoolean(FirstRunActivity.RESULT_SHOW_SYNC_SETTINGS));
- }
-
- /**
- * Allows the user to sign-in if there are no pending FRE sign-in requests.
- * @param context A context
- */
- public static void updateSigninManagerFirstRunCheckDone(Context context) {
- SigninManager manager = SigninManager.get(context);
- if (manager.isSignInAllowed()) return;
- if (!FirstRunStatus.getFirstRunFlowComplete(context)) return;
- if (!getFirstRunFlowSignInComplete(context)) return;
- manager.onFirstRunCheckDone();
- }
-}

Powered by Google App Engine
This is Rietveld 408576698