More experimental work on API accounts

4 files changed, 127 insertions, 144 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 aa4c1f131..6e7b76fbe 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,6 +19,7 @@ package org.sufficientlysecure.keychain.provider;
 
 import android.net.Uri;
 import android.provider.BaseColumns;
+
 import org.sufficientlysecure.keychain.Constants;
 
 public class KeychainContract {
@@ -59,6 +60,7 @@ public class KeychainContract {
     }
 
     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";
@@ -90,8 +92,7 @@ public class KeychainContract {
     public static final String PATH_USER_IDS = "user_ids";
     public static final String PATH_KEYS = "keys";
 
-    public static final String BASE_API = "api";
-    public static final String PATH_APPS = "apps";
+    public static final String BASE_API_APPS = "api_apps";
     public static final String PATH_ACCOUNTS = "accounts";
 
     public static final String PATH_BY_PACKAGE_NAME = "package_name";
@@ -257,36 +258,9 @@ public class KeychainContract {
         }
     }
 
-    /**
-     * Join over ApiApps with ApiAppsAccounts
-     */
-    public static class Api implements ApiAppsColumns, ApiAppsAccountsColumns, BaseColumns {
-        public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
-                .appendPath(BASE_API).build();
-
-        /**
-         * Use if multiple items get returned
-         */
-        public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.thialfihar.apg.apis";
-
-        /**
-         * Use if a single item is returned
-         */
-        public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.thialfihar.apg.api";
-
-        public static Uri buildIdUri(String rowId) {
-            return CONTENT_URI.buildUpon().appendPath(rowId).build();
-        }
-
-        public static Uri buildByPackageNameUri(String packageName) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_BY_PACKAGE_NAME).appendPath(packageName)
-                    .build();
-        }
-    }
-
     public static class ApiApps implements ApiAppsColumns, BaseColumns {
         public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
-                .appendPath(BASE_API).appendPath(PATH_APPS).build();
+                .appendPath(BASE_API_APPS).build();
 
         /**
          * Use if multiple items get returned
@@ -303,14 +277,14 @@ public class KeychainContract {
         }
 
         public static Uri buildByPackageNameUri(String packageName) {
-            return CONTENT_URI.buildUpon().appendPath(PATH_BY_PACKAGE_NAME).appendPath(packageName)
-                    .build();
+            return CONTENT_URI.buildUpon().appendPath(PATH_BY_PACKAGE_NAME)
+                    .appendEncodedPath(packageName).build();
         }
     }
 
     public static class ApiAccounts implements ApiAppsAccountsColumns, BaseColumns {
         public static final Uri CONTENT_URI = BASE_CONTENT_URI_INTERNAL.buildUpon()
-                .appendPath(BASE_API).appendPath(PATH_ACCOUNTS).build();
+                .appendPath(BASE_API_APPS).build();
 
         /**
          * Use if multiple items get returned
@@ -322,13 +296,24 @@ public class KeychainContract {
          */
         public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.thialfihar.apg.api.account";
 
-        public static Uri buildIdUri(String rowId) {
-            return CONTENT_URI.buildUpon().appendPath(rowId).build();
+//        public static Uri buildUri(String rowIdApp) {
+//            return CONTENT_URI.buildUpon().appendPath(rowIdApp).appendPath(PATH_ACCOUNTS)
+//                    .build();
+//        }
+//
+//        public static Uri buildIdUri(String rowIdApp, String rowId) {
+//            return CONTENT_URI.buildUpon().appendPath(rowIdApp).appendPath(PATH_ACCOUNTS)
+//                    .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();
         }
     }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
index e56fa2f8f..ca1a47f0c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
@@ -82,10 +82,11 @@ public class KeychainDatabase extends SQLiteOpenHelper {
 
     private static final String CREATE_API_APPS_ACCOUNTS = "CREATE TABLE IF NOT EXISTS " + Tables.API_ACCOUNTS
             + " (" + BaseColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, "
+            + ApiAppsAccountsColumns.ACCOUNT_NAME + " TEXT UNIQUE, "
             + ApiAppsAccountsColumns.KEY_ID + " INT64, "
             + ApiAppsAccountsColumns.ENCRYPTION_ALGORITHM + " INTEGER, "
             + ApiAppsAccountsColumns.HASH_ALORITHM + " INTEGER, "
-            + ApiAppsAccountsColumns.COMPRESSION + " INTEGER"
+            + ApiAppsAccountsColumns.COMPRESSION + " INTEGER, "
             + ApiAppsAccountsColumns.PACKAGE_NAME_FK + " TEXT NOT NULL, FOREIGN KEY("
             + ApiAppsAccountsColumns.PACKAGE_NAME_FK + ") REFERENCES " + Tables.API_APPS + "("
             + ApiAppsColumns.PACKAGE_NAME + ") ON DELETE CASCADE)";
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index a094b13de..cae76003c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
@@ -30,10 +30,8 @@ import android.provider.BaseColumns;
 import android.text.TextUtils;
 
 import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.provider.KeychainContract.Api;
 import org.sufficientlysecure.keychain.provider.KeychainContract.ApiAccounts;
 import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps;
-import org.sufficientlysecure.keychain.provider.KeychainContract.ApiAppsAccountsColumns;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingsColumns;
 import org.sufficientlysecure.keychain.provider.KeychainContract.KeyTypes;
@@ -81,15 +79,12 @@ public class KeychainProvider extends ContentProvider {
     private static final int SECRET_KEY_RING_USER_ID = 221;
     private static final int SECRET_KEY_RING_USER_ID_BY_ROW_ID = 222;
 
-    private static final int API = 301;
-    private static final int API_BY_ROW_ID = 302;
-    private static final int API_BY_PACKAGE_NAME = 303;
-    private static final int API_APPS = 304;
-    private static final int API_APPS_BY_ROW_ID = 305;
-    private static final int API_APPS_BY_PACKAGE_NAME = 306;
-    private static final int API_ACCOUNTS = 307;
-    private static final int API_ACCOUNTS_BY_ROW_ID = 308;
-    private static final int API_ACCOUNTS_BY_PACKAGE_NAME = 309;
+    private static final int API_APPS = 301;
+    private static final int API_APPS_BY_ROW_ID = 302;
+    private static final int API_APPS_BY_PACKAGE_NAME = 303;
+    private static final int API_ACCOUNTS = 304;
+    private static final int API_ACCOUNTS_BY_ROW_ID = 305;
+    private static final int API_ACCOUNTS_BY_ACCOUNT_NAME = 306;
 
     private static final int UNIFIED_KEY_RING = 401;
 
@@ -247,26 +242,18 @@ public class KeychainProvider extends ContentProvider {
         /**
          * API apps
          */
-        matcher.addURI(authority, KeychainContract.BASE_API, API);
-        matcher.addURI(authority, KeychainContract.BASE_API + "/#", API_BY_ROW_ID);
-        matcher.addURI(authority, KeychainContract.BASE_API + "/"
-                + KeychainContract.PATH_BY_PACKAGE_NAME + "/*", API_BY_PACKAGE_NAME);
-
-        matcher.addURI(authority, KeychainContract.BASE_API + "/"
-                + KeychainContract.PATH_APPS, API_APPS);
-        matcher.addURI(authority, KeychainContract.BASE_API + "/"
-                + KeychainContract.PATH_APPS + "/#", API_APPS_BY_ROW_ID);
-        matcher.addURI(authority, KeychainContract.BASE_API + "/"
-                + KeychainContract.PATH_APPS + "/"
+        matcher.addURI(authority, KeychainContract.BASE_API_APPS, API_APPS);
+        matcher.addURI(authority, KeychainContract.BASE_API_APPS + "/#", API_APPS_BY_ROW_ID);
+        matcher.addURI(authority, KeychainContract.BASE_API_APPS + "/"
                 + KeychainContract.PATH_BY_PACKAGE_NAME + "/*", API_APPS_BY_PACKAGE_NAME);
 
-        matcher.addURI(authority, KeychainContract.BASE_API + "/"
+        matcher.addURI(authority, KeychainContract.BASE_API_APPS + "/"
                 + KeychainContract.PATH_ACCOUNTS, API_ACCOUNTS);
-        matcher.addURI(authority, KeychainContract.BASE_API + "/"
+        matcher.addURI(authority, KeychainContract.BASE_API_APPS + "/"
                 + KeychainContract.PATH_ACCOUNTS + "/#", API_ACCOUNTS_BY_ROW_ID);
-        matcher.addURI(authority, KeychainContract.BASE_API + "/"
+        matcher.addURI(authority, KeychainContract.BASE_API_APPS + "/"
                 + KeychainContract.PATH_ACCOUNTS + "/"
-                + KeychainContract.PATH_BY_PACKAGE_NAME + "/*", API_ACCOUNTS_BY_PACKAGE_NAME);
+                + KeychainContract.PATH_BY_PACKAGE_NAME + "/*", API_ACCOUNTS_BY_ACCOUNT_NAME);
 
         /**
          * data stream
@@ -332,13 +319,6 @@ public class KeychainProvider extends ContentProvider {
             case SECRET_KEY_RING_USER_ID_BY_ROW_ID:
                 return UserIds.CONTENT_ITEM_TYPE;
 
-            case API:
-                return Api.CONTENT_TYPE;
-
-            case API_BY_ROW_ID:
-            case API_BY_PACKAGE_NAME:
-                return Api.CONTENT_ITEM_TYPE;
-
             case API_APPS:
                 return ApiApps.CONTENT_TYPE;
 
@@ -350,7 +330,7 @@ public class KeychainProvider extends ContentProvider {
                 return ApiAccounts.CONTENT_TYPE;
 
             case API_ACCOUNTS_BY_ROW_ID:
-            case API_ACCOUNTS_BY_PACKAGE_NAME:
+            case API_ACCOUNTS_BY_ACCOUNT_NAME:
                 return ApiAccounts.CONTENT_ITEM_TYPE;
 
             default:
@@ -696,28 +676,6 @@ public class KeychainProvider extends ContentProvider {
                 qb.appendWhereEscapeString(uri.getLastPathSegment());
 
                 break;
-            case API:
-                qb.setTables(Tables.API_ACCOUNTS + " INNER JOIN " + Tables.API_APPS + " ON " + "("
-                        + Tables.API_APPS + "." + ApiApps.PACKAGE_NAME + " = " + Tables.API_ACCOUNTS + "."
-                        + ApiAccounts.PACKAGE_NAME_FK + " )");
-
-                break;
-            case API_BY_ROW_ID:
-                qb.setTables(Tables.API_ACCOUNTS + " INNER JOIN " + Tables.API_APPS + " ON " + "("
-                        + Tables.API_APPS + "." + ApiApps.PACKAGE_NAME + " = " + Tables.API_ACCOUNTS + "."
-                        + ApiAccounts.PACKAGE_NAME_FK + " )");
-                qb.appendWhere(Tables.API_APPS + "." + BaseColumns._ID + " = ");
-                qb.appendWhereEscapeString(uri.getLastPathSegment());
-
-                break;
-            case API_BY_PACKAGE_NAME:
-                qb.setTables(Tables.API_ACCOUNTS + " INNER JOIN " + Tables.API_APPS + " ON " + "("
-                        + Tables.API_APPS + "." + ApiApps.PACKAGE_NAME + " = " + Tables.API_ACCOUNTS + "."
-                        + ApiAccounts.PACKAGE_NAME_FK + " )");
-                qb.appendWhere(Tables.API_APPS + "." + ApiApps.PACKAGE_NAME + " = ");
-                qb.appendWhereEscapeString(uri.getLastPathSegment());
-
-                break;
             case API_APPS:
                 qb.setTables(Tables.API_APPS);
 
@@ -740,15 +698,24 @@ public class KeychainProvider extends ContentProvider {
 
                 break;
             case API_ACCOUNTS_BY_ROW_ID:
-                qb.setTables(Tables.API_ACCOUNTS);
+                qb.setTables(Tables.API_ACCOUNTS + " INNER JOIN " + Tables.API_APPS + " ON " + "("
+                        + Tables.API_APPS + "." + ApiApps.PACKAGE_NAME + " = " + Tables.API_ACCOUNTS + "."
+                        + ApiAccounts.PACKAGE_NAME_FK + " )");
+                qb.appendWhere(Tables.API_APPS + "." + BaseColumns._ID + " = ");
+                qb.appendWhereEscapeString(uri.getPathSegments().get(2));
 
-                qb.appendWhere(BaseColumns._ID + " = ");
+                qb.appendWhere(" AND " + Tables.API_ACCOUNTS + "." + BaseColumns._ID + " = ");
                 qb.appendWhereEscapeString(uri.getLastPathSegment());
 
                 break;
-            case API_ACCOUNTS_BY_PACKAGE_NAME:
-                qb.setTables(Tables.API_ACCOUNTS);
-                qb.appendWhere(ApiAppsAccountsColumns.PACKAGE_NAME_FK + " = ");
+            case API_ACCOUNTS_BY_ACCOUNT_NAME:
+                qb.setTables(Tables.API_ACCOUNTS + " INNER JOIN " + Tables.API_APPS + " ON " + "("
+                        + Tables.API_APPS + "." + ApiApps.PACKAGE_NAME + " = " + Tables.API_ACCOUNTS + "."
+                        + ApiAccounts.PACKAGE_NAME_FK + " )");
+                qb.appendWhere(Tables.API_APPS + "." + ApiApps.PACKAGE_NAME + " = ");
+                qb.appendWhereEscapeString(uri.getPathSegments().get(2));
+
+                qb.appendWhere(" AND " + Tables.API_ACCOUNTS + "." + ApiAccounts.ACCOUNT_NAME + " = ");
                 qb.appendWhereEscapeString(uri.getLastPathSegment());
 
                 break;
@@ -808,13 +775,15 @@ public class KeychainProvider extends ContentProvider {
                     values.put(Keys.TYPE, KeyTypes.PUBLIC);
 
                     rowId = db.insertOrThrow(Tables.KEYS, null, values);
-                    rowUri = Keys.buildPublicKeysUri(Long.toString(rowId));
+                    // TODO: this is wrong:
+//                    rowUri = Keys.buildPublicKeysUri(Long.toString(rowId));
                     sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
 
                     break;
                 case PUBLIC_KEY_RING_USER_ID:
                     rowId = db.insertOrThrow(Tables.USER_IDS, null, values);
-                    rowUri = UserIds.buildPublicUserIdsUri(Long.toString(rowId));
+                    // TODO: this is wrong:
+//                    rowUri = UserIds.buildPublicUserIdsUri(Long.toString(rowId));
                     sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
 
                     break;
@@ -830,13 +799,15 @@ public class KeychainProvider extends ContentProvider {
                     values.put(Keys.TYPE, KeyTypes.SECRET);
 
                     rowId = db.insertOrThrow(Tables.KEYS, null, values);
-                    rowUri = Keys.buildSecretKeysUri(Long.toString(rowId));
+                    // TODO: this is wrong:
+//                    rowUri = Keys.buildSecretKeysUri(Long.toString(rowId));
                     sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
 
                     break;
                 case SECRET_KEY_RING_USER_ID:
                     rowId = db.insertOrThrow(Tables.USER_IDS, null, values);
-                    rowUri = UserIds.buildSecretUserIdsUri(Long.toString(rowId));
+                    // TODO: this is wrong:
+//                    rowUri = UserIds.buildSecretUserIdsUri(Long.toString(rowId));
 
                     break;
                 case API_APPS:
@@ -846,7 +817,8 @@ public class KeychainProvider extends ContentProvider {
                     break;
                 case API_ACCOUNTS:
                     rowId = db.insertOrThrow(Tables.API_ACCOUNTS, null, values);
-                    rowUri = ApiAccounts.buildIdUri(Long.toString(rowId));
+                    // TODO: this is wrong:
+//                    rowUri = ApiAccounts.buildIdUri(Long.toString(rowId));
 
                     break;
                 default:
@@ -918,7 +890,7 @@ public class KeychainProvider extends ContentProvider {
                 count = db.delete(Tables.API_ACCOUNTS, buildDefaultApiAccountsSelection(uri, false, selection),
                         selectionArgs);
                 break;
-            case API_ACCOUNTS_BY_PACKAGE_NAME:
+            case API_ACCOUNTS_BY_ACCOUNT_NAME:
                 count = db.delete(Tables.API_ACCOUNTS, buildDefaultApiAccountsSelection(uri, true, selection),
                         selectionArgs);
                 break;
@@ -996,7 +968,7 @@ public class KeychainProvider extends ContentProvider {
                     count = db.update(Tables.API_ACCOUNTS, values,
                             buildDefaultApiAccountsSelection(uri, false, selection), selectionArgs);
                     break;
-                case API_ACCOUNTS_BY_PACKAGE_NAME:
+                case API_ACCOUNTS_BY_ACCOUNT_NAME:
                     count = db.update(Tables.API_ACCOUNTS, values,
                             buildDefaultApiAccountsSelection(uri, true, selection), selectionArgs);
                     break;
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 7e8bfbc7b..e3727b2f8 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -22,6 +22,7 @@ import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.net.Uri;
 import android.os.RemoteException;
+
 import org.spongycastle.bcpg.ArmoredOutputStream;
 import org.spongycastle.openpgp.*;
 import org.sufficientlysecure.keychain.Constants;
@@ -33,6 +34,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
 import org.sufficientlysecure.keychain.provider.KeychainContract.Keys;
 import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds;
 import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
+import org.sufficientlysecure.keychain.remote.AccountSettings;
 import org.sufficientlysecure.keychain.remote.AppSettings;
 import org.sufficientlysecure.keychain.util.IterableIterator;
 import org.sufficientlysecure.keychain.util.Log;
@@ -469,11 +471,11 @@ public class ProviderHelper {
         cr.delete(KeyRings.buildSecretKeyRingsUri(Long.toString(rowId)), null, null);
     }
 
-    public static void deleteUnifiedKeyRing(Context context,String masterKeyId,boolean isSecretKey){
-        ContentResolver cr= context.getContentResolver();
-        cr.delete(KeyRings.buildPublicKeyRingsByMasterKeyIdUri(masterKeyId),null,null);
-        if(isSecretKey){
-            cr.delete(KeyRings.buildSecretKeyRingsByMasterKeyIdUri(masterKeyId),null,null);
+    public static void deleteUnifiedKeyRing(Context context, String masterKeyId, boolean isSecretKey) {
+        ContentResolver cr = context.getContentResolver();
+        cr.delete(KeyRings.buildPublicKeyRingsByMasterKeyIdUri(masterKeyId), null, null);
+        if (isSecretKey) {
+            cr.delete(KeyRings.buildSecretKeyRingsByMasterKeyIdUri(masterKeyId), null, null);
         }
 
     }
@@ -504,7 +506,7 @@ public class ProviderHelper {
                         + " AS sign_keys WHERE sign_keys." + Keys.KEY_RING_ROW_ID + " = "
                         + KeychainDatabase.Tables.KEY_RINGS + "." + KeyRings._ID
                         + " AND sign_keys." + Keys.CAN_SIGN + " = '1' AND " + Keys.IS_MASTER_KEY
-                        + " = 1) AS sign", };
+                        + " = 1) AS sign",};
 
         ContentResolver cr = context.getContentResolver();
         Cursor cursor = cr.query(queryUri, projection, null, null, null);
@@ -801,70 +803,93 @@ public class ProviderHelper {
         ContentValues values = new ContentValues();
         values.put(ApiApps.PACKAGE_NAME, appSettings.getPackageName());
         values.put(ApiApps.PACKAGE_SIGNATURE, appSettings.getPackageSignature());
-//        values.put(ApiApps.KEY_ID, appSettings.getKeyId());
-//        values.put(ApiApps.COMPRESSION, appSettings.getCompression());
-//        values.put(ApiApps.ENCRYPTION_ALGORITHM, appSettings.getEncryptionAlgorithm());
-//        values.put(ApiApps.HASH_ALORITHM, appSettings.getHashAlgorithm());
-
         return values;
     }
 
-    private static ContentValues contentValueForApiAccounts(AppSettings appSettings) {
+    private static ContentValues contentValueForApiAccounts(AccountSettings accSettings) {
         ContentValues values = new ContentValues();
-        values.put(KeychainContract.ApiAccounts.PACKAGE_NAME_FK, appSettings.getPackageName());
-        values.put(KeychainContract.ApiAccounts.KEY_ID, appSettings.getKeyId());
-        values.put(KeychainContract.ApiAccounts.COMPRESSION, appSettings.getCompression());
-        values.put(KeychainContract.ApiAccounts.ENCRYPTION_ALGORITHM, appSettings.getEncryptionAlgorithm());
-        values.put(KeychainContract.ApiAccounts.HASH_ALORITHM, appSettings.getHashAlgorithm());
-
+        values.put(KeychainContract.ApiAccounts.ACCOUNT_NAME, accSettings.getAccountName());
+        values.put(KeychainContract.ApiAccounts.KEY_ID, accSettings.getKeyId());
+        values.put(KeychainContract.ApiAccounts.COMPRESSION, accSettings.getCompression());
+        values.put(KeychainContract.ApiAccounts.ENCRYPTION_ALGORITHM, accSettings.getEncryptionAlgorithm());
+        values.put(KeychainContract.ApiAccounts.HASH_ALORITHM, accSettings.getHashAlgorithm());
+//        values.put(KeychainContract.ApiAccounts.PACKAGE_NAME_FK, accSettings.getPackageName());
         return values;
     }
 
-    public static void insertApi(Context context, AppSettings appSettings) {
+    public static void insertApiApp(Context context, AppSettings appSettings) {
         context.getContentResolver().insert(KeychainContract.ApiApps.CONTENT_URI,
                 contentValueForApiApps(appSettings));
-        context.getContentResolver().insert(KeychainContract.ApiAccounts.CONTENT_URI,
-                contentValueForApiApps(appSettings));
     }
 
-    // TODO: uri not working because it is used for both tables
+    public static void insertApiAccount(Context context, Uri uri, AccountSettings accSettings) {
+        context.getContentResolver().insert(uri,
+                contentValueForApiAccounts(accSettings));
+    }
+
     public static void updateApiApp(Context context, AppSettings appSettings, Uri uri) {
         if (context.getContentResolver().update(uri, contentValueForApiApps(appSettings), null,
                 null) <= 0) {
             throw new RuntimeException();
         }
-        if (context.getContentResolver().update(uri, contentValueForApiAccounts(appSettings), null,
+    }
+
+    public static void updateApiAccount(Context context, AccountSettings accSettings, Uri uri) {
+        if (context.getContentResolver().update(uri, contentValueForApiAccounts(accSettings), null,
                 null) <= 0) {
             throw new RuntimeException();
         }
     }
 
-    public static AppSettings getApiSettings(Context context, Uri uri) {
+
+    /**
+     * Must be an uri pointing to an account
+     *
+     * @param context
+     * @param uri
+     * @return
+     */
+    public static AppSettings getApiAppSettings(Context context, Uri uri) {
         AppSettings settings = null;
 
         Cursor cur = context.getContentResolver().query(uri, null, null, null, null);
         if (cur != null && cur.moveToFirst()) {
             settings = new AppSettings();
-            settings.setPackageName(cur.getString(cur
-                    .getColumnIndex(KeychainContract.Api.PACKAGE_NAME)));
-            settings.setPackageSignature(cur.getBlob(cur
-                    .getColumnIndex(KeychainContract.Api.PACKAGE_SIGNATURE)));
-            settings.setKeyId(cur.getLong(cur.getColumnIndex(KeychainContract.Api.KEY_ID)));
-            settings.setCompression(cur.getInt(cur
-                    .getColumnIndexOrThrow(KeychainContract.Api.COMPRESSION)));
-            settings.setHashAlgorithm(cur.getInt(cur
-                    .getColumnIndexOrThrow(KeychainContract.Api.HASH_ALORITHM)));
-            settings.setEncryptionAlgorithm(cur.getInt(cur
-                    .getColumnIndexOrThrow(KeychainContract.Api.ENCRYPTION_ALGORITHM)));
+            settings.setPackageName(cur.getString(
+                    cur.getColumnIndex(KeychainContract.ApiApps.PACKAGE_NAME)));
+            settings.setPackageSignature(cur.getBlob(
+                    cur.getColumnIndex(KeychainContract.ApiApps.PACKAGE_SIGNATURE)));
+        }
+
+        return settings;
+    }
+
+    public static AccountSettings getApiAccountSettings(Context context, Uri uri) {
+        AccountSettings settings = null;
+
+        Cursor cur = context.getContentResolver().query(uri, null, null, null, null);
+        if (cur != null && cur.moveToFirst()) {
+            settings = new AccountSettings();
+
+            settings.setAccountName(cur.getString(
+                    cur.getColumnIndex(KeychainContract.ApiAccounts.ACCOUNT_NAME)));
+            settings.setKeyId(cur.getLong(
+                    cur.getColumnIndex(KeychainContract.ApiAccounts.KEY_ID)));
+            settings.setCompression(cur.getInt(
+                    cur.getColumnIndexOrThrow(KeychainContract.ApiAccounts.COMPRESSION)));
+            settings.setHashAlgorithm(cur.getInt(
+                    cur.getColumnIndexOrThrow(KeychainContract.ApiAccounts.HASH_ALORITHM)));
+            settings.setEncryptionAlgorithm(cur.getInt(
+                    cur.getColumnIndexOrThrow(KeychainContract.ApiAccounts.ENCRYPTION_ALGORITHM)));
         }
 
         return settings;
     }
 
     public static byte[] getApiSignature(Context context, String packageName) {
-        Uri queryUri = KeychainContract.Api.buildByPackageNameUri(packageName);
+        Uri queryUri = ApiApps.buildByPackageNameUri(packageName);
 
-        String[] projection = new String[]{KeychainContract.Api.PACKAGE_SIGNATURE};
+        String[] projection = new String[]{ApiApps.PACKAGE_SIGNATURE};
 
         ContentResolver cr = context.getContentResolver();
         Cursor cursor = cr.query(queryUri, projection, null, null, null);