diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-03 02:42:05 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-03 02:43:06 +0200 |
commit | 7bc424a8cb1c3d4d4c77778f27bd18fe61da0736 (patch) | |
tree | 0350e5ec8fab966159963572224d2151f0b0451f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | |
parent | e9b14585f5eecddf8c22b2e68aa1a0500682ba3a (diff) | |
download | open-keychain-7bc424a8cb1c3d4d4c77778f27bd18fe61da0736.tar.gz open-keychain-7bc424a8cb1c3d4d4c77778f27bd18fe61da0736.tar.bz2 open-keychain-7bc424a8cb1c3d4d4c77778f27bd18fe61da0736.zip |
work on passphrase caching, make use of cached SecretKeyType data (WIP!)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index bfa95280e..186a0fc88 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -141,7 +141,11 @@ public class ProviderHelper { public static final int FIELD_TYPE_BLOB = 5; public Object getGenericData(Uri uri, String column, int type) throws NotFoundException { - return getGenericData(uri, new String[]{column}, new int[]{type}, null).get(column); + Object result = getGenericData(uri, new String[]{column}, new int[]{type}, null).get(column); + if (result == null) { + throw new NotFoundException(); + } + return result; } public Object getGenericData(Uri uri, String column, int type, String selection) @@ -229,6 +233,11 @@ public class ProviderHelper { } + public long getMasterKeyId(long subKeyId) throws NotFoundException { + return (Long) getGenericData(KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(subKeyId), + KeyRings.MASTER_KEY_ID, FIELD_TYPE_INTEGER); + } + public CachedPublicKeyRing getCachedPublicKeyRing(Uri queryUri) { return new CachedPublicKeyRing(this, queryUri); } |