| Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
|
| index 27a1e58e70519d956456dae6fd85e6d267ed35a1..005d4f58a326e586ecc76a51a3e04d1f3d948bb6 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java
|
| @@ -45,6 +45,7 @@ public class SavePasswordsPreferences extends PreferenceFragment
|
| // Keys for name/password dictionaries.
|
| public static final String PASSWORD_LIST_URL = "url";
|
| public static final String PASSWORD_LIST_NAME = "name";
|
| + public static final String PASSWORD_LIST_PASSWORD = "password";
|
|
|
| // Used to pass the password id into a new activity.
|
| public static final String PASSWORD_LIST_ID = "id";
|
| @@ -73,6 +74,18 @@ public class SavePasswordsPreferences extends PreferenceFragment
|
| private ChromeSwitchPreference mSavePasswordsSwitch;
|
| private ChromeBaseCheckBoxPreference mAutoSignInSwitch;
|
|
|
| + // Used for verifying if 60 seconds have passed since last authenticating, its value is set in
|
| + // PasswordReauthentication using System.currentTimeMillis() (milliseconds since the UNIX epoch)
|
| + private static long sLastReauthTimeMillis = 0;
|
| +
|
| + public static void setLastReauthTimeMillis(long value) {
|
| + sLastReauthTimeMillis = value;
|
| + }
|
| +
|
| + public static long getLastReauthTimeMillis() {
|
| + return sLastReauthTimeMillis;
|
| + }
|
| +
|
| @Override
|
| public void onCreate(Bundle savedInstanceState) {
|
| super.onCreate(savedInstanceState);
|
| @@ -111,6 +124,12 @@ public class SavePasswordsPreferences extends PreferenceFragment
|
| return true;
|
| }
|
|
|
| + @Override
|
| + public void onDetach() {
|
| + super.onDetach();
|
| + sLastReauthTimeMillis = 0;
|
| + }
|
| +
|
| void rebuildPasswordLists() {
|
| mNoPasswords = false;
|
| mNoPasswordExceptions = false;
|
| @@ -154,12 +173,14 @@ public class SavePasswordsPreferences extends PreferenceFragment
|
| PreferenceScreen screen = getPreferenceManager().createPreferenceScreen(getActivity());
|
| String url = saved.getUrl();
|
| String name = saved.getUserName();
|
| + String password = saved.getPassword();
|
| screen.setTitle(url);
|
| screen.setOnPreferenceClickListener(this);
|
| screen.setSummary(name);
|
| Bundle args = screen.getExtras();
|
| args.putString(PASSWORD_LIST_NAME, name);
|
| args.putString(PASSWORD_LIST_URL, url);
|
| + args.putString(PASSWORD_LIST_PASSWORD, password);
|
| args.putInt(PASSWORD_LIST_ID, i);
|
| profileCategory.addPreference(screen);
|
| }
|
|
|