summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ConfirmLockPassword.java
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2014-03-31 21:33:35 +0200
committerAdrian Roos <roosa@google.com>2014-04-02 16:28:10 +0200
commit8184ea524519a67b1284266844e6e186f3a74cab (patch)
tree53d79e0f2c176c8a1a80bea20f24fcb81e2b3c02 /src/com/android/settings/ConfirmLockPassword.java
parentc7843db06c736ed8b8635f2b5d52fdd891fbf69b (diff)
downloadpackages_apps_Settings-8184ea524519a67b1284266844e6e186f3a74cab.zip
packages_apps_Settings-8184ea524519a67b1284266844e6e186f3a74cab.tar.gz
packages_apps_Settings-8184ea524519a67b1284266844e6e186f3a74cab.tar.bz2
Add lockout after trying to enter PIN / Password too often
Enforce the same lockout that is already enforced when entering the pattern. Bug: 13647935 Change-Id: Ia60a2235ad526c293b7a8d5600f406f187004df7
Diffstat (limited to 'src/com/android/settings/ConfirmLockPassword.java')
-rw-r--r--src/com/android/settings/ConfirmLockPassword.java82
1 files changed, 68 insertions, 14 deletions
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index 1229046..79437f9 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -25,8 +25,10 @@ import android.app.Fragment;
import android.app.admin.DevicePolicyManager;
import android.content.Intent;
import android.os.Bundle;
+import android.os.CountDownTimer;
import android.os.Handler;
import android.preference.PreferenceActivity;
+import android.os.SystemClock;
import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;
@@ -70,7 +72,9 @@ public class ConfirmLockPassword extends PreferenceActivity {
private PasswordEntryKeyboardHelper mKeyboardHelper;
private PasswordEntryKeyboardView mKeyboardView;
private Button mContinueButton;
-
+ private int mNumWrongConfirmAttempts;
+ private CountDownTimer mCountdownTimer;
+ private boolean mIsAlpha;
// required constructor for fragments
public ConfirmLockPasswordFragment() {
@@ -101,29 +105,27 @@ public class ConfirmLockPassword extends PreferenceActivity {
mKeyboardView = (PasswordEntryKeyboardView) view.findViewById(R.id.keyboard);
mHeaderText = (TextView) view.findViewById(R.id.headerText);
- final boolean isAlpha = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == storedQuality
+ mIsAlpha = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == storedQuality
|| DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == storedQuality
|| DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == storedQuality;
- mHeaderText.setText(isAlpha ? R.string.lockpassword_confirm_your_password_header
- : R.string.lockpassword_confirm_your_pin_header);
+ mHeaderText.setText(getDefaultHeader());
final Activity activity = getActivity();
mKeyboardHelper = new PasswordEntryKeyboardHelper(activity,
mKeyboardView, mPasswordEntry);
- mKeyboardHelper.setKeyboardMode(isAlpha ?
+ mKeyboardHelper.setKeyboardMode(mIsAlpha ?
PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA
: PasswordEntryKeyboardHelper.KEYBOARD_MODE_NUMERIC);
mKeyboardView.requestFocus();
int currentType = mPasswordEntry.getInputType();
- mPasswordEntry.setInputType(isAlpha ? currentType
+ mPasswordEntry.setInputType(mIsAlpha ? currentType
: (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
// Update the breadcrumb (title) if this is embedded in a PreferenceActivity
if (activity instanceof PreferenceActivity) {
final PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
- int id = isAlpha ? R.string.lockpassword_confirm_your_password_header
- : R.string.lockpassword_confirm_your_pin_header;
+ int id = getDefaultHeader();
CharSequence title = getText(id);
preferenceActivity.showBreadCrumbs(title, title);
}
@@ -131,10 +133,19 @@ public class ConfirmLockPassword extends PreferenceActivity {
return view;
}
+ private int getDefaultHeader() {
+ return mIsAlpha ? R.string.lockpassword_confirm_your_password_header
+ : R.string.lockpassword_confirm_your_pin_header;
+ }
+
@Override
public void onPause() {
super.onPause();
mKeyboardView.requestFocus();
+ if (mCountdownTimer != null) {
+ mCountdownTimer.cancel();
+ mCountdownTimer = null;
+ }
}
@Override
@@ -142,6 +153,10 @@ public class ConfirmLockPassword extends PreferenceActivity {
// TODO Auto-generated method stub
super.onResume();
mKeyboardView.requestFocus();
+ long deadline = mLockPatternUtils.getLockoutAttemptDeadline();
+ if (deadline != 0) {
+ handleAttemptLockout(deadline);
+ }
}
private void handleNext() {
@@ -154,10 +169,40 @@ public class ConfirmLockPassword extends PreferenceActivity {
getActivity().setResult(RESULT_OK, intent);
getActivity().finish();
} else {
- showError(R.string.lockpattern_need_to_unlock_wrong);
+ if (++mNumWrongConfirmAttempts >= LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT) {
+ long deadline = mLockPatternUtils.setLockoutAttemptDeadline();
+ handleAttemptLockout(deadline);
+ } else {
+ showError(R.string.lockpattern_need_to_unlock_wrong);
+ }
}
}
+ private void handleAttemptLockout(long elapsedRealtimeDeadline) {
+ long elapsedRealtime = SystemClock.elapsedRealtime();
+ showError(R.string.lockpattern_too_many_failed_confirmation_attempts_header, 0);
+ mPasswordEntry.setEnabled(false);
+ mCountdownTimer = new CountDownTimer(
+ elapsedRealtimeDeadline - elapsedRealtime,
+ LockPatternUtils.FAILED_ATTEMPT_COUNTDOWN_INTERVAL_MS) {
+
+ @Override
+ public void onTick(long millisUntilFinished) {
+ final int secondsCountdown = (int) (millisUntilFinished / 1000);
+ mHeaderText.setText(getString(
+ R.string.lockpattern_too_many_failed_confirmation_attempts_footer,
+ secondsCountdown));
+ }
+
+ @Override
+ public void onFinish() {
+ mPasswordEntry.setEnabled(true);
+ mHeaderText.setText(getDefaultHeader());
+ mNumWrongConfirmAttempts = 0;
+ }
+ }.start();
+ }
+
public void onClick(View v) {
switch (v.getId()) {
case R.id.next_button:
@@ -172,13 +217,22 @@ public class ConfirmLockPassword extends PreferenceActivity {
}
private void showError(int msg) {
+ showError(msg, ERROR_MESSAGE_TIMEOUT);
+ }
+
+ private final Runnable mResetErrorRunnable = new Runnable() {
+ public void run() {
+ mHeaderText.setText(getDefaultHeader());
+ }
+ };
+
+ private void showError(int msg, long timeout) {
mHeaderText.setText(msg);
mPasswordEntry.setText(null);
- mHandler.postDelayed(new Runnable() {
- public void run() {
- mHeaderText.setText(R.string.lockpassword_confirm_your_password_header);
- }
- }, ERROR_MESSAGE_TIMEOUT);
+ mHandler.removeCallbacks(mResetErrorRunnable);
+ if (timeout != 0) {
+ mHandler.postDelayed(mResetErrorRunnable, timeout);
+ }
}
// {@link OnEditorActionListener} methods.