Redirect users without sync passphrase to passwords.google.com

chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
index ff2012db779815eddf0704128642e861eeedefb9..baa14c602d08726cdeeab8c8b528f61332ba6bea 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
@@ -4,11 +4,16 @@
 
 package org.chromium.chrome.browser.preferences;
 
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
+import android.text.SpannableString;
+import android.text.style.ForegroundColorSpan;
 
+import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.PasswordUIView;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
@@ -17,11 +22,15 @@ import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
+import org.chromium.chrome.browser.sync.ProfileSyncService;
+import org.chromium.sync.AndroidSyncSettings;
+import org.chromium.ui.text.SpanApplier;
 
 /**
  * The main settings screen, shown when the user first opens Settings.
  */
-public class MainPreferences extends PreferenceFragment implements SignInStateObserver {
+public class MainPreferences extends PreferenceFragment implements SignInStateObserver,
+        Preference.OnPreferenceClickListener {
 
     public static final String PREF_SIGN_IN = "sign_in";
     public static final String PREF_SEARCH_ENGINE = "search_engine";
@@ -30,15 +39,20 @@ public class MainPreferences extends PreferenceFragment implements SignInStateOb
     public static final String PREF_SAVED_PASSWORDS = "saved_passwords";
     public static final String PREF_HOMEPAGE = "homepage";
     public static final String PREF_DATA_REDUCTION = "data_reduction";
-
     public static final String ACCOUNT_PICKER_DIALOG_TAG = "account_picker_dialog_tag";
     public static final String EXTRA_SHOW_SEARCH_ENGINE_PICKER = "show_search_engine_picker";
 
+    private static final String PREF_MANAGE_ACCOUNT_LINK = "manage_account_link";
+
+    private static final int ORDER_MANAGE_ACCOUNT_LINK = 2;
+
     private SignInPreference mSignInPreference;
     private ManagedPreferenceDelegate mManagedPreferenceDelegate;
 
     private boolean mShowSearchEnginePicker;
 
+    private Preference mPasswordsPref;
+
     public MainPreferences() {
         setHasOptionsMenu(true);
         mManagedPreferenceDelegate = createManagedPreferenceDelegate();
@@ -77,6 +91,16 @@ public class MainPreferences extends PreferenceFragment implements SignInStateOb
         clearSignInPref();
     }
 
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        Intent intent = new Intent(
+                  Intent.ACTION_VIEW,
+                  Uri.parse(PasswordUIView.getAccountDashboardURL()));
+        intent.setPackage(getActivity().getPackageName());
+        getActivity().startActivity(intent);
+        return true;
+    }
+
     private void updatePreferences() {
         if (getPreferenceScreen() != null) getPreferenceScreen().removeAll();
         addPreferencesFromResource(R.xml.main_preferences);
@@ -86,15 +110,36 @@ public class MainPreferences extends PreferenceFragment implements SignInStateOb
         setOnOffSummary(autofillPref, PersonalDataManager.isAutofillEnabled());
         autofillPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 
-        ChromeBasePreference passwordsPref =
+        ChromeBasePreference mPasswordsPref =
                 (ChromeBasePreference) findPreference(PREF_SAVED_PASSWORDS);
-        if (PasswordUIView.shouldUseSmartLockBranding()) {
-            passwordsPref.setTitle(getResources().getString(
-                    R.string.prefs_smart_lock_for_passwords));
+
+        ProfileSyncService syncService = ProfileSyncService.get();
+
+        if (AndroidSyncSettings.isSyncEnabled(getActivity().getApplicationContext())
+                  && !syncService.isUsingSecondaryPassphrase()) {
+            ForegroundColorSpan colorSpan = new ForegroundColorSpan(
+                    ApiCompatibilityUtils.getColor(getResources(), R.color.pref_accent_color));
+            SpannableString title = SpanApplier.applySpans(
+                    getString(R.string.manage_passwords_text),
+                    new SpanApplier.SpanInfo("<link>", "</link>", colorSpan));
+            mPasswordsPref.setKey(PREF_MANAGE_ACCOUNT_LINK);
+            mPasswordsPref.setTitle(title);
+            mPasswordsPref.setOnPreferenceClickListener(this);
+        } else {
+            if (PasswordUIView.shouldUseSmartLockBranding()) {
+                mPasswordsPref.setTitle(getResources().getString(
+                         R.string.prefs_smart_lock_for_passwords));
+            } else {
+                mPasswordsPref.setTitle(getResources().getString(

[vabr (Chromium), 2016/06/27 15:23:44]

Just curious -- why is this necessary now and not before the CL?

[dozsa, 2016/06/28 09:53:23]

The title used to be hardcoded in the xml file, and if I were to leave it there
it would be displayed even for syncing users without a custom passphrase. I
removed it from there and set it here as a workaround, should I be doing
something else?

[vabr (Chromium), 2016/06/28 11:51:38]

Acknowledged, this makes sense, thanks for the explanation.

+                          R.string.prefs_saved_passwords));
+                mPasswordsPref.setFragment(
+                        "org.chromium.chrome.browser.preferences."
+                        + "password.SavePasswordsPreferences");
+            }
+            setOnOffSummary(mPasswordsPref,
+                    PrefServiceBridge.getInstance().isRememberPasswordsEnabled());
+            mPasswordsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
         }
-        setOnOffSummary(passwordsPref,
-                PrefServiceBridge.getInstance().isRememberPasswordsEnabled());
-        passwordsPref.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
 
         Preference homepagePref = findPreference(PREF_HOMEPAGE);
         if (HomepageManager.shouldShowHomepageSetting()) {