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

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

Issue 1678753003: [Android] Mark first run checks as completed when forcing sign in. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/firstrun/ForcedSigninProcessor.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ForcedSigninProcessor.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ForcedSigninProcessor.java
index cc57c8df808d81163382ca47079f356d1146a4d7..8b332a1cb172a19850e04cd2b75ef4ade7f3b8fc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ForcedSigninProcessor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ForcedSigninProcessor.java
@@ -8,6 +8,7 @@ import android.accounts.Account;
import android.content.Context;
import org.chromium.base.Callback;
+import org.chromium.base.Log;
import org.chromium.chrome.browser.services.AndroidEduAndChildAccountHelper;
import org.chromium.chrome.browser.signin.AccountManagementFragment;
import org.chromium.chrome.browser.signin.SigninManager;
@@ -28,6 +29,8 @@ import org.chromium.sync.signin.ChromeSigninController;
* ForcedSigninProcessor.start(appContext).
*/
public final class ForcedSigninProcessor {
+ private static final String TAG = "ForcedSignin";
+
/*
* Only for static usage.
*/
@@ -60,25 +63,30 @@ public final class ForcedSigninProcessor {
*/
private static void processForcedSignIn(final Context appContext) {
final SigninManager signinManager = SigninManager.get(appContext);
+ // By definition we have finished all the checks for first run.
+ signinManager.onFirstRunCheckDone();
if (!FeatureUtilities.canAllowSync(appContext) || !signinManager.isSignInAllowed()) {
+ Log.d(TAG, "Sign in disallowed");
return;
}
AccountManagerHelper.get(appContext).getGoogleAccounts(new Callback<Account[]>() {
@Override
public void onResult(Account[] accounts) {
- if (accounts.length == 1) {
- signinManager.signIn(accounts[0], null, new SigninManager.SignInCallback() {
- @Override
- public void onSignInComplete() {
- // Since this is a forced signin, signout is not allowed.
- AccountManagementFragment.setSignOutAllowedPreferenceValue(
- appContext, false);
- }
-
- @Override
- public void onSignInAborted() {}
- });
+ if (accounts.length != 1) {
+ Log.d(TAG, "Incorrect number of accounts (%d)", accounts.length);
+ return;
}
+ signinManager.signIn(accounts[0], null, new SigninManager.SignInCallback() {
+ @Override
+ public void onSignInComplete() {
+ // Since this is a forced signin, signout is not allowed.
+ AccountManagementFragment.setSignOutAllowedPreferenceValue(
+ appContext, false);
+ }
+
+ @Override
+ public void onSignInAborted() {}
+ });
}
});
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698