PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for 1785342: The old PIN is required after entering New PIN

Browse Source 
State of dialogs was not properly maintained across pause/resume.
This commit is contained in:
Amith Yamasani
2009-08-28 15:36:52 -07:00
parent 98fa0e2941
commit 11cd8c5ac9
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/IccLockSettings.java
View File

@@ -261,10 +261,13 @@ public class IccLockSettings extends PreferenceActivity
mPinToggle.setChecked(!mToState);
mDialogState = ICC_LOCK_MODE;
showPinDialog();
} else if (preference == mPinDialog) {
mDialogState = ICC_OLD_MODE;
return false;
}
return true;
}
private void tryChangeIccLockState() {
// Try to change icc lock. If it succeeds, toggle the lock state and
// reset dialog state. Else inject error message and show dialog again.
@@ -277,7 +280,6 @@ public class IccLockSettings extends PreferenceActivity
if (success) {
mPinToggle.setChecked(mToState);
} else {
// TODO: I18N
Toast.makeText(this, mRes.getString(R.string.sim_lock_failed), Toast.LENGTH_SHORT)
.show();
}
@@ -286,7 +288,6 @@ public class IccLockSettings extends PreferenceActivity
private void iccPinChanged(boolean success) {
if (!success) {
// TODO: I18N
Toast.makeText(this, mRes.getString(R.string.sim_change_failed),
Toast.LENGTH_SHORT)
.show();
@@ -304,7 +305,7 @@ public class IccLockSettings extends PreferenceActivity
mPhone.getIccCard().changeIccLockPassword(mOldPin,
mNewPin, callback);
}
private boolean reasonablePin(String pin) {
if (pin == null || pin.length() < MIN_PIN_LENGTH || pin.length() > MAX_PIN_LENGTH) {
return false;
@@ -312,11 +313,12 @@ public class IccLockSettings extends PreferenceActivity
return true;
}
}
private void resetDialogState() {
mError = null;
mDialogState = ICC_OLD_MODE; // Default for when Change PIN is clicked
mPin = "";
setDialogValues();
mDialogState = OFF_MODE;
}
}