From 7bc424a8cb1c3d4d4c77778f27bd18fe61da0736 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 3 Sep 2014 02:42:05 +0200 Subject: work on passphrase caching, make use of cached SecretKeyType data (WIP!) --- .../sufficientlysecure/keychain/provider/ProviderHelper.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java') 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); } -- cgit v1.2.3