1 files changed, 107 insertions, 147 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
index 404c128a1..2b40300d7 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java
@@ -19,46 +19,47 @@ package org.sufficientlysecure.keychain.provider;
 
 import android.net.Uri;
 import android.provider.BaseColumns;
+
 import org.sufficientlysecure.keychain.Constants;
 
 public class KeychainContract {
 
     interface KeyRingsColumns {
         String MASTER_KEY_ID = "master_key_id"; // not a database id
-        String TYPE = "type"; // see KeyTypes
         String KEY_RING_DATA = "key_ring_data"; // PGPPublicKeyRing / PGPSecretKeyRing blob
     }
 
     interface KeysColumns {
+        String MASTER_KEY_ID = "master_key_id"; // not a database id
+        String RANK = "rank";
+
         String KEY_ID = "key_id"; // not a database id
-        String TYPE = "type"; // see KeyTypes
-        String IS_MASTER_KEY = "is_master_key";
         String ALGORITHM = "algorithm";
+        String FINGERPRINT = "fingerprint";
+
         String KEY_SIZE = "key_size";
-        String CAN_CERTIFY = "can_certify";
         String CAN_SIGN = "can_sign";
         String CAN_ENCRYPT = "can_encrypt";
+        String CAN_CERTIFY = "can_certify";
         String IS_REVOKED = "is_revoked";
+
         String CREATION = "creation";
         String EXPIRY = "expiry";
-        String KEY_RING_ROW_ID = "key_ring_row_id"; // foreign key to key_rings._ID
-        String KEY_DATA = "key_data"; // PGPPublicKey/PGPSecretKey blob
-        String RANK = "rank";
-        String FINGERPRINT = "fingerprint";
     }
 
     interface UserIdsColumns {
-        String KEY_RING_ROW_ID = "key_ring_row_id"; // foreign key to key_rings._ID
+        String MASTER_KEY_ID = "master_key_id"; // foreign key to key_rings._ID
         String USER_ID = "user_id"; // not a database id
-        String RANK = "rank";
+        String RANK = "rank"; // ONLY used for sorting! no key, no nothing!
+        String IS_PRIMARY = "is_primary";
     }
 
     interface CertsColumns {
-        String KEY_RING_ROW_ID = "key_ring_row_id"; // verified id, foreign key to key_rings._ID
+        String MASTER_KEY_ID = "master_key_id"; // verified id, foreign key to key_rings._ID
         String RANK = "rank"; // rank of verified key
-        String KEY_ID = "key_id"; // verified id, not a database id
         String KEY_ID_CERTIFIER = "key_id_certifier"; // verifying id, not a database id
         String CREATION = "creation";
+        String EXPIRY = "expiry";
         String VERIFIED = "verified";
         String KEY_DATA = "key_data"; // certification blob
     }
@@ -66,10 +67,15 @@ public class KeychainContract {
     interface ApiAppsColumns {
         String PACKAGE_NAME = "package_name";
         String PACKAGE_SIGNATURE = "package_signature";
+    }
+
+    interface ApiAppsAccountsColumns {
+        String ACCOUNT_NAME = "account_name";
         String KEY_ID = "key_id"; // not a database id
         String ENCRYPTION_ALGORITHM = "encryption_algorithm";
         String HASH_ALORITHM = "hash_algorithm";
         String COMPRESSION = "compression";
+        String PACKAGE_NAME = "package_name"; // foreign key to api_apps.package_name
     }
 
     public static final class KeyTypes {
@@ -85,97 +91,81 @@ public class KeychainContract {
     public static final String BASE_KEY_RINGS = "key_rings";
     public static final String BASE_DATA = "data";
 
-    public static final String PATH_PUBLIC = "public";
-    public static final String PATH_SECRET = "secret";
+    public static final String PATH_UNIFIED = "unified";
 
-    public static final String PATH_BY_MASTER_KEY_ID = "master_key_id";
-    public static final String PATH_BY_KEY_ID = "key_id";
-    public static final String PATH_BY_KEY_ROW_ID = "key_row_id";
-    public static final String PATH_BY_CERTIFIER_ID = "certifier_id";
-    public static final String PATH_BY_EMAILS = "emails";
-    public static final String PATH_BY_LIKE_EMAIL = "like_email";
+    public static final String PATH_FIND = "find";
+    public static final String PATH_BY_EMAIL = "email";
+    public static final String PATH_BY_SUBKEY = "subkey";
 
+    public static final String PATH_PUBLIC = "public";
+    public static final String PATH_SECRET = "secret";
     public static final String PATH_USER_IDS = "user_ids";
     public static final String PATH_KEYS = "keys";
+    public static final String PATH_CERTS = "certs";
 
     public static final String BASE_API_APPS = "api_apps";
-    public static final String PATH_BY_PACKAGE_NAME = "package_name";
+    public static final String PATH_ACCOUNTS = "accounts";
 
-    public static final String BASE_CERTS = "certs";
+    public static class KeyRings implements BaseColumns, KeysColumns, UserIdsColumns {
+        public static final String MASTER_KEY_ID = "master_key_id";
+        public static final String HAS_SECRET = "has_secret";
 
-    public static class KeyRings implements KeyRingsColumns, BaseColumns {
         public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
                 .appendPath(BASE_KEY_RINGS).build();
 
-        /**
-         * Use if multiple items get returned
-         */
-        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.thialfihar.apg.key_ring";
-
-        /**
-         * Use if a single item is returned
-         */
-        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.thialfihar.apg.key_ring";
+        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.sufficientlysecure.openkeychain.key_ring";
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.sufficientlysecure.openkeychain.key_ring";
 
         public static Uri buildUnifiedKeyRingsUri() {
-            return CONTENT_URI;
+            return CONTENT_URI.buildUpon().appendPath(PATH_UNIFIED).build();
         }
 
-        public static Uri buildPublicKeyRingsUri() {
-            return CONTENT_URI.buildUpon().appendPath(PATH_PUBLIC).build();
+        public static Uri buildGenericKeyRingUri(String masterKeyId) {
+            return CONTENT_URI.buildUpon().appendPath(masterKeyId).build();
         }
-
-        public static Uri buildPublicKeyRingsUri(String keyRingRowId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_PUBLIC).appendPath(keyRingRowId).build();
+        public static Uri buildUnifiedKeyRingUri(String masterKeyId) {
+            return CONTENT_URI.buildUpon().appendPath(masterKeyId).appendPath(PATH_UNIFIED).build();
         }
-
-        public static Uri buildPublicKeyRingsByMasterKeyIdUri(String masterKeyId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_PUBLIC)
-                    .appendPath(PATH_BY_MASTER_KEY_ID).appendPath(masterKeyId).build();
+        public static Uri buildUnifiedKeyRingUri(Uri uri) {
+            return CONTENT_URI.buildUpon().appendPath(uri.getPathSegments().get(1)).appendPath(PATH_UNIFIED).build();
         }
 
-        public static Uri buildPublicKeyRingsByKeyIdUri(String keyId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_PUBLIC).appendPath(PATH_BY_KEY_ID)
-                    .appendPath(keyId).build();
+        public static Uri buildUnifiedKeyRingsFindByEmailUri(String email) {
+            return CONTENT_URI.buildUpon().appendPath(PATH_FIND).appendPath(PATH_BY_EMAIL).appendPath(email).build();
         }
-
-        public static Uri buildPublicKeyRingsByEmailsUri(String emails) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_PUBLIC).appendPath(PATH_BY_EMAILS)
-                    .appendPath(emails).build();
+        public static Uri buildUnifiedKeyRingsFindBySubkeyUri(String subkey) {
+            return CONTENT_URI.buildUpon().appendPath(PATH_FIND).appendPath(PATH_BY_SUBKEY).appendPath(subkey).build();
         }
 
-        public static Uri buildPublicKeyRingsByLikeEmailUri(String emails) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_PUBLIC).appendPath(PATH_BY_LIKE_EMAIL)
-                    .appendPath(emails).build();
-        }
+    }
 
-        public static Uri buildSecretKeyRingsUri() {
-            return CONTENT_URI.buildUpon().appendPath(PATH_SECRET).build();
-        }
+    public static class KeyRingData implements KeyRingsColumns, BaseColumns {
+        public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
+                .appendPath(BASE_KEY_RINGS).build();
 
-        public static Uri buildSecretKeyRingsUri(String keyRingRowId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_SECRET).appendPath(keyRingRowId).build();
-        }
+        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.sufficientlysecure.openkeychain.key_ring_data";
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.sufficientlysecure.openkeychain.key_ring_data";
 
-        public static Uri buildSecretKeyRingsByMasterKeyIdUri(String masterKeyId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_SECRET)
-                    .appendPath(PATH_BY_MASTER_KEY_ID).appendPath(masterKeyId).build();
+        public static Uri buildPublicKeyRingUri() {
+            return CONTENT_URI.buildUpon().appendPath(PATH_PUBLIC).build();
         }
-
-        public static Uri buildSecretKeyRingsByKeyIdUri(String keyId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_SECRET).appendPath(PATH_BY_KEY_ID)
-                    .appendPath(keyId).build();
+        public static Uri buildPublicKeyRingUri(String masterKeyId) {
+            return CONTENT_URI.buildUpon().appendPath(masterKeyId).appendPath(PATH_PUBLIC).build();
         }
-
-        public static Uri buildSecretKeyRingsByEmailsUri(String emails) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_SECRET).appendPath(PATH_BY_EMAILS)
-                    .appendPath(emails).build();
+        public static Uri buildPublicKeyRingUri(Uri uri) {
+            return CONTENT_URI.buildUpon().appendPath(uri.getPathSegments().get(1)).appendPath(PATH_PUBLIC).build();
         }
 
-        public static Uri buildSecretKeyRingsByLikeEmails(String emails) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_SECRET).appendPath(PATH_BY_LIKE_EMAIL)
-                    .appendPath(emails).build();
+        public static Uri buildSecretKeyRingUri() {
+            return CONTENT_URI.buildUpon().appendPath(PATH_SECRET).build();
+        }
+        public static Uri buildSecretKeyRingUri(String masterKeyId) {
+            return CONTENT_URI.buildUpon().appendPath(masterKeyId).appendPath(PATH_SECRET).build();
+        }
+        public static Uri buildSecretKeyRingUri(Uri uri) {
+            return CONTENT_URI.buildUpon().appendPath(uri.getPathSegments().get(1)).appendPath(PATH_SECRET).build();
         }
+
     }
 
     public static class Keys implements KeysColumns, BaseColumns {
@@ -185,131 +175,101 @@ public class KeychainContract {
         /**
          * Use if multiple items get returned
          */
-        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.thialfihar.apg.key";
+        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.sufficientlysecure.openkeychain.key";
 
         /**
          * Use if a single item is returned
          */
-        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.thialfihar.apg.key";
-
-        public static Uri buildPublicKeysUri(String keyRingRowId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_PUBLIC).appendPath(keyRingRowId)
-                    .appendPath(PATH_KEYS).build();
-        }
-
-        public static Uri buildPublicKeysUri(String keyRingRowId, String keyRowId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_PUBLIC).appendPath(keyRingRowId)
-                    .appendPath(PATH_KEYS).appendPath(keyRowId).build();
-        }
-
-        public static Uri buildSecretKeysUri(String keyRingRowId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_SECRET).appendPath(keyRingRowId)
-                    .appendPath(PATH_KEYS).build();
-        }
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.sufficientlysecure.openkeychain.key";
 
-        public static Uri buildSecretKeysUri(String keyRingRowId, String keyRowId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_SECRET).appendPath(keyRingRowId)
-                    .appendPath(PATH_KEYS).appendPath(keyRowId).build();
+        public static Uri buildKeysUri(String masterKeyId) {
+            return CONTENT_URI.buildUpon().appendPath(masterKeyId).appendPath(PATH_KEYS).build();
         }
-
-        public static Uri buildKeysUri(Uri keyRingUri) {
-            return keyRingUri.buildUpon().appendPath(PATH_KEYS).build();
+        public static Uri buildKeysUri(Uri uri) {
+            return CONTENT_URI.buildUpon().appendPath(uri.getPathSegments().get(1)).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 {
+        public static final String VERIFIED = "verified";
         public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
                 .appendPath(BASE_KEY_RINGS).build();
 
         /**
          * Use if multiple items get returned
          */
-        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.thialfihar.apg.user_id";
+        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.sufficientlysecure.openkeychain.user_id";
 
         /**
          * Use if a single item is returned
          */
-        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.thialfihar.apg.user_id";
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.sufficientlysecure.openkeychain.user_id";
 
-        public static Uri buildPublicUserIdsUri(String keyRingRowId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_PUBLIC).appendPath(keyRingRowId)
-                    .appendPath(PATH_USER_IDS).build();
+        public static Uri buildUserIdsUri(String masterKeyId) {
+            return CONTENT_URI.buildUpon().appendPath(masterKeyId).appendPath(PATH_USER_IDS).build();
         }
-
-        public static Uri buildPublicUserIdsUri(String keyRingRowId, String userIdRowId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_PUBLIC).appendPath(keyRingRowId)
-                    .appendPath(PATH_USER_IDS).appendPath(userIdRowId).build();
+        public static Uri buildUserIdsUri(Uri uri) {
+            return CONTENT_URI.buildUpon().appendPath(uri.getPathSegments().get(1)).appendPath(PATH_USER_IDS).build();
         }
+    }
 
-        public static Uri buildSecretUserIdsUri(String keyRingRowId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_SECRET).appendPath(keyRingRowId)
-                    .appendPath(PATH_USER_IDS).build();
-        }
+    public static class ApiApps implements ApiAppsColumns, BaseColumns {
+        public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
+                .appendPath(BASE_API_APPS).build();
 
-        public static Uri buildSecretUserIdsUri(String keyRingRowId, String userIdRowId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_SECRET).appendPath(keyRingRowId)
-                    .appendPath(PATH_USER_IDS).appendPath(userIdRowId).build();
-        }
+        /**
+         * Use if multiple items get returned
+         */
+        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.sufficientlysecure.openkeychain.api_apps";
 
-        public static Uri buildUserIdsUri(Uri keyRingUri) {
-            return keyRingUri.buildUpon().appendPath(PATH_USER_IDS).build();
-        }
+        /**
+         * Use if a single item is returned
+         */
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.sufficientlysecure.openkeychain.api_app";
 
-        public static Uri buildUserIdsUri(Uri keyRingUri, String userIdRowId) {
-            return keyRingUri.buildUpon().appendPath(PATH_USER_IDS).appendPath(userIdRowId).build();
+        public static Uri buildByPackageNameUri(String packageName) {
+            return CONTENT_URI.buildUpon().appendEncodedPath(packageName).build();
         }
     }
 
-    public static class ApiApps implements ApiAppsColumns, BaseColumns {
+    public static class ApiAccounts implements ApiAppsAccountsColumns, BaseColumns {
         public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
                 .appendPath(BASE_API_APPS).build();
 
         /**
          * Use if multiple items get returned
          */
-        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.thialfihar.apg.api_apps";
+        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.sufficientlysecure.openkeychain.api_app.accounts";
 
         /**
          * Use if a single item is returned
          */
-        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.thialfihar.apg.api_apps";
+        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.sufficientlysecure.openkeychain.api_app.account";
 
-        public static Uri buildIdUri(String rowId) {
-            return CONTENT_URI.buildUpon().appendPath(rowId).build();
+        public static Uri buildBaseUri(String packageName) {
+            return CONTENT_URI.buildUpon().appendEncodedPath(packageName).appendPath(PATH_ACCOUNTS)
+                    .build();
         }
 
-        public static Uri buildByPackageNameUri(String packageName) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_BY_PACKAGE_NAME).appendPath(packageName)
-                    .build();
+        public static Uri buildByPackageAndAccountUri(String packageName, String accountName) {
+            return CONTENT_URI.buildUpon().appendEncodedPath(packageName).appendPath(PATH_ACCOUNTS)
+                    .appendEncodedPath(accountName).build();
         }
     }
 
     public static class Certs implements CertsColumns, BaseColumns {
-        public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
-                .appendPath(BASE_CERTS).build();
+        public static final String USER_ID = UserIdsColumns.USER_ID;
+        public static final String SIGNER_UID = "signer_user_id";
 
-        // do we even need this one...? just using it as default for database insert notifications~
-        public static Uri buildCertsUri(String rowId) {
-            return CONTENT_URI.buildUpon().appendPath(rowId).build();
-        }
-
-        public static Uri buildCertsByKeyRowIdUri(String keyRingRowId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_BY_KEY_ROW_ID)
-                    .appendPath(keyRingRowId).build();
-        }
+        public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
+                .appendPath(BASE_KEY_RINGS).build();
 
-        public static Uri buildCertsByKeyIdUri(String keyId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_BY_KEY_ID).appendPath(keyId)
-                    .build();
+        public static Uri buildCertsUri(String masterKeyId) {
+            return CONTENT_URI.buildUpon().appendPath(masterKeyId).appendPath(PATH_CERTS).build();
         }
-
-        public static Uri buildCertsByCertifierKeyIdUri(String keyId) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_BY_CERTIFIER_ID).appendPath(keyId)
-                    .build();
+        public static Uri buildCertsUri(Uri uri) {
+            return CONTENT_URI.buildUpon().appendPath(uri.getPathSegments().get(1)).appendPath(PATH_CERTS).build();
         }
 
     }