From e9b14585f5eecddf8c22b2e68aa1a0500682ba3a Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Wed, 3 Sep 2014 01:22:31 +0200 Subject: add getSecretKeyType method to CachedPublicKeyRing --- .../keychain/provider/ProviderHelper.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (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 e1dae55ad..bfa95280e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -141,12 +141,22 @@ 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}).get(column); + return getGenericData(uri, new String[]{column}, new int[]{type}, null).get(column); + } + + public Object getGenericData(Uri uri, String column, int type, String selection) + throws NotFoundException { + return getGenericData(uri, new String[]{column}, new int[]{type}, selection).get(column); } public HashMap getGenericData(Uri uri, String[] proj, int[] types) + throws NotFoundException { + return getGenericData(uri, proj, types, null); + } + + public HashMap getGenericData(Uri uri, String[] proj, int[] types, String selection) throws NotFoundException { - Cursor cursor = mContentResolver.query(uri, proj, null, null, null); + Cursor cursor = mContentResolver.query(uri, proj, selection, null, null); try { HashMap result = new HashMap(proj.length); @@ -223,6 +233,10 @@ public class ProviderHelper { return new CachedPublicKeyRing(this, queryUri); } + public CachedPublicKeyRing getCachedPublicKeyRing(long id) { + return new CachedPublicKeyRing(this, KeyRings.buildUnifiedKeyRingUri(id)); + } + public CanonicalizedPublicKeyRing getCanonicalizedPublicKeyRing(long id) throws NotFoundException { return (CanonicalizedPublicKeyRing) getCanonicalizedKeyRing(KeyRings.buildUnifiedKeyRingUri(id), false); } -- cgit v1.2.3