PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Merge pull request #1737 from runnerway/backup-code-fix

Browse source 
Fix backup code comparison
This commit is contained in:
Dominik Schürmann 2016-03-02 00:21:27 +01:00
parent 77150418cd ece848dee8
commit 568e0ff380
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/BackupCodeFragment.java
View file

@ -351,27 +351,28 @@ public class BackupCodeFragment extends CryptoOperationFragment<BackupKeyringPar
@Override
public void afterTextChanged(Editable s) {
String currentBackupCode = backupCode.getText().toString();
boolean inInputState = mCurrentState == BackupCodeState.STATE_INPUT
|| mCurrentState == BackupCodeState.STATE_INPUT_ERROR;
boolean partIsComplete = (backupCode.getText().toString().indexOf(' ') == -1)
&& (backupCode.getText().toString().indexOf('\u00a0') == -1);
boolean partIsComplete = (currentBackupCode.indexOf(' ') == -1)
&& (currentBackupCode.indexOf('\u00a0') == -1);
if (!inInputState || !partIsComplete) {
return;
}
checkIfCodeIsCorrect(backupCode);
checkIfCodeIsCorrect(currentBackupCode);
}
});
}
private void checkIfCodeIsCorrect(EditText backupCode) {
private void checkIfCodeIsCorrect(String currentBackupCode) {
if (Constants.DEBUG && mDebugModeAcceptAnyCode) {
switchState(BackupCodeState.STATE_OK, true);
return;
}
if (backupCode.toString().equals(mBackupCode)) {
if (currentBackupCode.equals(mBackupCode)) {
switchState(BackupCodeState.STATE_OK, true);
return;
}