moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity

Fix passphrase retrieval

Browse Source
This commit is contained in:
Dominik Schürmann 2014-03-05 02:06:44 +01:00
parent 875adae40c
commit a1230bbe53
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
View File

@ -310,16 +310,18 @@ public class PgpDecryptVerify {
pbe = encData; pbe = encData;
// passphrase handling... // if no passphrase was explicitly set try to get it from the cache service
if (passphrase == null) { if (passphrase == null) {
// try to get cached passphrase // returns "" if key has no passphrase
passphrase = PassphraseCacheService.getCachedPassphrase(context, encData.getKeyID()); passphrase = PassphraseCacheService.getCachedPassphrase(context, encData.getKeyID());
}
// if passphrase was not cached, return here! // if passphrase was not cached, return here indicating that a passphrase is missing!
if (passphrase == null) { if (passphrase == null) {
returnData.setKeyPassphraseNeeded(true); returnData.setKeyPassphraseNeeded(true);
return returnData; return returnData;
} }
}
break; break;
} }