[Signin] Update sign in promo triggering logic

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninHelper.java

 // 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.signin;
 
 import android.accounts.Account;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.AsyncTask;
 
 import com.google.android.gms.auth.AccountChangeEvent;
 import com.google.android.gms.auth.GoogleAuthException;
 import com.google.android.gms.auth.GoogleAuthUtil;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.invalidation.InvalidationServiceFactory;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.SigninManager.SignInCallback;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
 import org.chromium.components.signin.AccountManagerHelper;
 import org.chromium.components.signin.ChromeSigninController;
 import org.chromium.components.sync.AndroidSyncSettings;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 import javax.annotation.Nullable;
 
 /**
  * A helper for tasks like re-signin.
  *
  * This should be merged into SigninManager when it is upstreamed.
  */
 public class SigninHelper {
 
     private static final String TAG = "SigninHelper";
 
     private static final Object LOCK = new Object();
 
     private static final String ACCOUNTS_CHANGED_PREFS_KEY = "prefs_sync_accounts_changed";
 
     // Key to the shared pref that holds the new account's name if the currently signed
     // in account has been renamed.
     private static final String ACCOUNT_RENAMED_PREFS_KEY = "prefs_sync_account_renamed";
 
     // Key to the shared pref that holds the last read index of all the account changed
     // events of the current signed in account.
     private static final String ACCOUNT_RENAME_EVENT_INDEX_PREFS_KEY =
             "prefs_sync_account_rename_event_index";
 
-    private static final String ANDROID_ACCOUNTS_PREFS_KEY = "prefs_sync_android_accounts";
-
     private static SigninHelper sInstance;
 
     /**
      * Retrieve more detailed information from account changed intents.
      */
     public static interface AccountChangeEventChecker {
         public List<String> getAccountChangeEvents(
                 Context context, int index, String accountName);
     }
 
@@ skipping 62 matching lines @@
 
     public void validateAccountSettings(boolean accountsChanged) {
         // Ensure System accounts have been seeded.
         mAccountTrackerService.checkAndSeedSystemAccounts();
         if (!accountsChanged) {
             mAccountTrackerService.validateSystemAccounts();
         }
 
         Account syncAccount = mChromeSigninController.getSignedInUser();
         if (syncAccount == null) {
+            ChromePreferenceManager chromePreferenceManager =
+                    ChromePreferenceManager.getInstance(mContext);
+            if (chromePreferenceManager.getShowSigninPromo()) return;
+
             // Never shows a signin promo if user has manually disconnected.
             String lastSyncAccountName =
                     PrefServiceBridge.getInstance().getSyncLastAccountName();
             if (lastSyncAccountName != null && !lastSyncAccountName.isEmpty()) return;
 
-            SharedPreferences sharedPrefs = ContextUtils.getAppSharedPreferences();
-            boolean hasKnownAccountKeys = sharedPrefs.contains(ANDROID_ACCOUNTS_PREFS_KEY);
-            // Nothing to do if Android accounts are not changed and already known to Chrome.
-            if (hasKnownAccountKeys && !accountsChanged) return;
-
-            List<String> currentAccountNames =
-                    AccountManagerHelper.get(mContext).getGoogleAccountNames();
-            if (hasKnownAccountKeys) {
-                ChromePreferenceManager chromePreferenceManager =
-                        ChromePreferenceManager.getInstance(mContext);
-                if (!chromePreferenceManager.getSigninPromoShown()) {
-                    Set<String> lastKnownAccountNames = sharedPrefs.getStringSet(
-                            ANDROID_ACCOUNTS_PREFS_KEY, new HashSet<String>());
-                    Set<String> newAccountNames = new HashSet<String>(currentAccountNames);
-                    newAccountNames.removeAll(lastKnownAccountNames);
-                    if (!newAccountNames.isEmpty()) {
-                        chromePreferenceManager.setShowSigninPromo(true);
-                    }
-                }
+            if (!chromePreferenceManager.getSigninPromoShown()
+                    && AccountManagerHelper.get(mContext).getGoogleAccountNames().size() > 0) {
+                chromePreferenceManager.setShowSigninPromo(true);
             }
 
-            sharedPrefs.edit().putStringSet(
-                    ANDROID_ACCOUNTS_PREFS_KEY, new HashSet<String>(currentAccountNames)).apply();
             return;
         }
 
         String renamedAccount = getNewSignedInAccountName(mContext);
         if (accountsChanged && renamedAccount != null) {
             handleAccountRename(ChromeSigninController.get(mContext).getSignedInAccountName(),
                     renamedAccount);
             return;
         }
 
@@ skipping 206 matching lines @@
                 .getBoolean(ACCOUNTS_CHANGED_PREFS_KEY, false)) {
             // Clear the value in prefs.
             ContextUtils.getAppSharedPreferences()
                     .edit().putBoolean(ACCOUNTS_CHANGED_PREFS_KEY, false).apply();
             return true;
         } else {
             return false;
         }
     }
 }