fix symmetric decryption with backup code (fixes #1677)
This commit is contained in:
parent
808a9e4f54
commit
e20e528f5e
|
@ -368,7 +368,6 @@ public class PassphraseDialogActivity extends FragmentActivity {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
|
||||||
final Passphrase passphrase;
|
|
||||||
if (mRequiredInput.mType == RequiredInputType.BACKUP_CODE) {
|
if (mRequiredInput.mType == RequiredInputType.BACKUP_CODE) {
|
||||||
StringBuilder backupCodeInput = new StringBuilder(26);
|
StringBuilder backupCodeInput = new StringBuilder(26);
|
||||||
for (EditText editText : mBackupCodeEditText) {
|
for (EditText editText : mBackupCodeEditText) {
|
||||||
|
@ -380,16 +379,18 @@ public class PassphraseDialogActivity extends FragmentActivity {
|
||||||
}
|
}
|
||||||
backupCodeInput.deleteCharAt(backupCodeInput.length() - 1);
|
backupCodeInput.deleteCharAt(backupCodeInput.length() - 1);
|
||||||
|
|
||||||
passphrase = new Passphrase(backupCodeInput.toString());
|
Passphrase passphrase = new Passphrase(backupCodeInput.toString());
|
||||||
} else {
|
finishCaching(passphrase);
|
||||||
passphrase = new Passphrase(mPassphraseEditText);
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final Passphrase passphrase = new Passphrase(mPassphraseEditText);
|
||||||
final int timeToLiveSeconds = mTimeToLiveSpinner.getSelectedTimeToLive();
|
final int timeToLiveSeconds = mTimeToLiveSpinner.getSelectedTimeToLive();
|
||||||
|
|
||||||
// Early breakout if we are dealing with a symmetric key
|
// Early breakout if we are dealing with a symmetric key
|
||||||
if (mSecretRing == null) {
|
if (mSecretRing == null) {
|
||||||
if ( ! mRequiredInput.mSkipCaching) {
|
if (!mRequiredInput.mSkipCaching) {
|
||||||
PassphraseCacheService.addCachedPassphrase(getActivity(),
|
PassphraseCacheService.addCachedPassphrase(getActivity(),
|
||||||
Constants.key.symmetric, Constants.key.symmetric, passphrase,
|
Constants.key.symmetric, Constants.key.symmetric, passphrase,
|
||||||
getString(R.string.passp_cache_notif_pwd), timeToLiveSeconds);
|
getString(R.string.passp_cache_notif_pwd), timeToLiveSeconds);
|
||||||
|
|
Loading…
Reference in a new issue