2 files changed, 24 insertions, 8 deletions

diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
index 82bb473f6..d2381f6f0 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainContract.java
@@ -69,8 +69,8 @@ public class KeychainContract {
 
     public static final String CONTENT_AUTHORITY = Constants.PACKAGE_NAME + ".provider";
 
-    private static final Uri BASE_CONTENT_URI_INTERNAL = Uri.parse("content://"
-            + CONTENT_AUTHORITY);
+    private static final Uri BASE_CONTENT_URI_INTERNAL = Uri
+            .parse("content://" + CONTENT_AUTHORITY);
 
     public static final String BASE_KEY_RINGS = "key_rings";
     public static final String BASE_DATA = "data";
@@ -185,6 +185,14 @@ public class KeychainContract {
             return CONTENT_URI.buildUpon().appendPath(PATH_SECRET).appendPath(keyRingRowId)
                     .appendPath(PATH_KEYS).appendPath(keyRowId).build();
         }
+
+        public static Uri buildKeysUri(Uri keyRingUri) {
+            return keyRingUri.buildUpon().appendPath(PATH_KEYS).build();
+        }
+
+        public static Uri buildKeysUri(Uri keyRingUri, String keyRowId) {
+            return keyRingUri.buildUpon().appendPath(PATH_KEYS).appendPath(keyRowId).build();
+        }
     }
 
     public static class UserIds implements UserIdsColumns, BaseColumns {
@@ -216,6 +224,14 @@ public class KeychainContract {
             return CONTENT_URI.buildUpon().appendPath(PATH_SECRET).appendPath(keyRingRowId)
                     .appendPath(PATH_USER_IDS).appendPath(userIdRowId).build();
         }
+
+        public static Uri buildUserIdsUri(Uri keyRingUri) {
+            return keyRingUri.buildUpon().appendPath(PATH_USER_IDS).build();
+        }
+
+        public static Uri buildUserIdsUri(Uri keyRingUri, String userIdRowId) {
+            return keyRingUri.buildUpon().appendPath(PATH_USER_IDS).appendPath(userIdRowId).build();
+        }
     }
 
     public static class ApiApps implements ApiAppsColumns, BaseColumns {
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index f12048277..1683c7c0e 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -60,7 +60,7 @@ public class ProviderHelper {
      * @param queryUri
      * @return
      */
-    private static PGPKeyRing getPGPKeyRing(Context context, Uri queryUri) {
+    public static PGPKeyRing getPGPKeyRing(Context context, Uri queryUri) {
         Cursor cursor = context.getContentResolver().query(queryUri,
                 new String[] { KeyRings._ID, KeyRings.KEY_RING_DATA }, null, null, null);
 
@@ -493,7 +493,7 @@ public class ProviderHelper {
      */
     public static long getPublicMasterKeyId(Context context, long keyRingRowId) {
         Uri queryUri = KeyRings.buildPublicKeyRingsUri(String.valueOf(keyRingRowId));
-        return getMasterKeyId(context, queryUri, keyRingRowId);
+        return getMasterKeyId(context, queryUri);
     }
 
     /**
@@ -551,7 +551,7 @@ public class ProviderHelper {
      */
     public static long getSecretMasterKeyId(Context context, long keyRingRowId) {
         Uri queryUri = KeyRings.buildSecretKeyRingsUri(String.valueOf(keyRingRowId));
-        return getMasterKeyId(context, queryUri, keyRingRowId);
+        return getMasterKeyId(context, queryUri);
     }
 
     /**
@@ -562,7 +562,7 @@ public class ProviderHelper {
      * @param keyRingRowId
      * @return
      */
-    private static long getMasterKeyId(Context context, Uri queryUri, long keyRingRowId) {
+    public static long getMasterKeyId(Context context, Uri queryUri) {
         String[] projection = new String[] { KeyRings.MASTER_KEY_ID };
 
         ContentResolver cr = context.getContentResolver();
@@ -592,7 +592,7 @@ public class ProviderHelper {
         return getKeyRingsAsArmoredString(context, KeyRings.buildSecretKeyRingsUri(), masterKeyIds);
     }
 
-    private static ArrayList<String> getKeyRingsAsArmoredString(Context context, Uri uri,
+    public static ArrayList<String> getKeyRingsAsArmoredString(Context context, Uri uri,
             long[] masterKeyIds) {
         ArrayList<String> output = new ArrayList<String>();
 
@@ -661,7 +661,7 @@ public class ProviderHelper {
         return getKeyRingsAsByteArray(context, KeyRings.buildSecretKeyRingsUri(), masterKeyIds);
     }
 
-    private static byte[] getKeyRingsAsByteArray(Context context, Uri uri, long[] masterKeyIds) {
+    public static byte[] getKeyRingsAsByteArray(Context context, Uri uri, long[] masterKeyIds) {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
 
         if (masterKeyIds != null && masterKeyIds.length > 0) {