diff options
| author | Stephen Bird <sbird@cyngn.com> | 2015-07-09 16:28:20 -0700 |
|---|---|---|
| committer | Stephen Bird <sbird@cyngn.com> | 2015-07-10 11:47:29 -0700 |
| commit | 194fd1f805cb6c706196d5f3b15c58dd8d58c87f (patch) | |
| tree | 3312c8de6a36bca354fd7b9f29db270c4ec5cd25 | |
| parent | 3180582068f42e19d29369b173216ac7a4b3fbf0 (diff) | |
| download | android_packages_apps_CMFileManager-194fd1f805cb6c706196d5f3b15c58dd8d58c87f.tar.gz android_packages_apps_CMFileManager-194fd1f805cb6c706196d5f3b15c58dd8d58c87f.tar.bz2 android_packages_apps_CMFileManager-194fd1f805cb6c706196d5f3b15c58dd8d58c87f.zip | |
Secure Storage: Fix unlock button
Change-Id: I852fff76aef4f47bbd6d809c64afcc2f77165553
(cherry picked from commit c2832885bd00d45ac7277930cff68063e1cb4d3a)
(cherry picked from commit 383538f8276690ba272d5ff740ad021ad5c95ca8)
| -rwxr-xr-x | src/com/cyanogenmod/filemanager/console/secure/SecureStorageKeyPromptDialog.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/cyanogenmod/filemanager/console/secure/SecureStorageKeyPromptDialog.java b/src/com/cyanogenmod/filemanager/console/secure/SecureStorageKeyPromptDialog.java index 73bb3ad4..f2045f8d 100755 --- a/src/com/cyanogenmod/filemanager/console/secure/SecureStorageKeyPromptDialog.java +++ b/src/com/cyanogenmod/filemanager/console/secure/SecureStorageKeyPromptDialog.java @@ -245,19 +245,19 @@ public class SecureStorageKeyPromptDialog boolean validLength = key.length() >= MIN_PASSWORD_LENGTH && (!mResetPassword || (mResetPassword && oldkey.length() >= MIN_PASSWORD_LENGTH)); boolean validEquals = key.equals(repeatKey); - boolean valid = validLength && - (((mNewStorage || mResetPassword) && validEquals) || mDeleteStorage); - mUnlock.setEnabled(valid); if (!validLength) { mValidationMsg.setText(getString(R.string.secure_storage_unlock_validation_length, MIN_PASSWORD_LENGTH)); mValidationMsg.setVisibility(View.VISIBLE); + mUnlock.setEnabled(false); } else if ((mNewStorage || mResetPassword) && !validEquals) { mValidationMsg.setText(R.string.secure_storage_unlock_validation_equals); mValidationMsg.setVisibility(View.VISIBLE); + mUnlock.setEnabled(false); } else { mValidationMsg.setVisibility(View.INVISIBLE); + mUnlock.setEnabled(true); } } |