cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix symmetric decryption with backup code (fixes #1677)

Browse Source
This commit is contained in:
Vincent Breitmoser
2016-01-13 03:12:24 +01:00
parent 808a9e4f54
commit e20e528f5e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
View File

@@ -368,7 +368,6 @@ public class PassphraseDialogActivity extends FragmentActivity {
@Override
public void onClick(View v) {
final Passphrase passphrase;
if (mRequiredInput.mType == RequiredInputType.BACKUP_CODE) {
StringBuilder backupCodeInput = new StringBuilder(26);
for (EditText editText : mBackupCodeEditText) {
@@ -380,11 +379,13 @@ public class PassphraseDialogActivity extends FragmentActivity {
}
backupCodeInput.deleteCharAt(backupCodeInput.length() - 1);
passphrase = new Passphrase(backupCodeInput.toString());
} else {
passphrase = new Passphrase(mPassphraseEditText);
Passphrase passphrase = new Passphrase(backupCodeInput.toString());
finishCaching(passphrase);
return;
}
final Passphrase passphrase = new Passphrase(mPassphraseEditText);
final int timeToLiveSeconds = mTimeToLiveSpinner.getSelectedTimeToLive();
// Early breakout if we are dealing with a symmetric key