diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-08 22:25:42 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-08 22:25:42 +0200 |
commit | a1efb24228774d786f22f7ee0440fdde0dda54ab (patch) | |
tree | 5f6010c20e5176995709d57c42a01959c2eb012b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
parent | 946c1e115cbf35cc7f4eae7c2480501892e86c0a (diff) | |
download | open-keychain-a1efb24228774d786f22f7ee0440fdde0dda54ab.tar.gz open-keychain-a1efb24228774d786f22f7ee0440fdde0dda54ab.tar.bz2 open-keychain-a1efb24228774d786f22f7ee0440fdde0dda54ab.zip |
Introduce ProviderHelper.NotFoundException, remove dead code
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java index 962b304c7..8d2afe3b7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java @@ -171,11 +171,12 @@ public class PassphraseCacheService extends Service { // try to get master key id which is used as an identifier for cached passphrases long masterKeyId = keyId; if (masterKeyId != Id.key.symmetric) { - masterKeyId = ProviderHelper.getMasterKeyId(this, - KeychainContract.KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(Long.toString(keyId))); - // Failure - if(masterKeyId == 0) + try { + masterKeyId = ProviderHelper.getMasterKeyId(this, + KeychainContract.KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(Long.toString(keyId))); + } catch (ProviderHelper.NotFoundException e) { return null; + } } Log.d(TAG, "getCachedPassphraseImpl() for masterKeyId " + masterKeyId); |