diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-09 16:30:13 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-09 16:30:13 +0100 |
| commit | 08fd2a2de3795cf8fc4be590ba993c356c8eb67f (patch) | |
| tree | e1ec9680b358fc383bb04ad35cf57209e37e30d2 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider | |
| parent | 99eb8725e92dde56511eafe2077e227cf9795f29 (diff) | |
| download | open-keychain-08fd2a2de3795cf8fc4be590ba993c356c8eb67f.tar.gz open-keychain-08fd2a2de3795cf8fc4be590ba993c356c8eb67f.tar.bz2 open-keychain-08fd2a2de3795cf8fc4be590ba993c356c8eb67f.zip | |
use loader in LinkedIdViewFragment
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider')
2 files changed, 16 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java index a7ca613d7..08f3b5248 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java @@ -266,6 +266,7 @@ public class KeychainContract { public static Uri buildLinkedIdsUri(Uri uri) { return CONTENT_URI.buildUpon().appendPath(uri.getPathSegments().get(1)).appendPath(PATH_LINKED_IDS).build(); } + } public static class ApiApps implements ApiAppsColumns, BaseColumns { @@ -354,7 +355,14 @@ public class KeychainContract { } public static Uri buildCertsUri(Uri uri) { - return CONTENT_URI.buildUpon().appendPath(uri.getPathSegments().get(1)).appendPath(PATH_CERTS).build(); + return CONTENT_URI.buildUpon().appendPath(uri.getPathSegments().get(1)) + .appendPath(PATH_CERTS).build(); + } + + public static Uri buildLinkedIdCertsUri(long masterKeyId, int rank) { + return CONTENT_URI.buildUpon().appendPath(Long.toString(masterKeyId)) + .appendPath(PATH_LINKED_IDS).appendPath(Integer.toString(rank)) + .appendPath(PATH_CERTS).build(); } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java index ac69ddd24..0f42b3934 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java @@ -63,6 +63,7 @@ public class KeychainProvider extends ContentProvider { private static final int KEY_RING_CERTS = 205; private static final int KEY_RING_CERTS_SPECIFIC = 206; private static final int KEY_RING_LINKED_IDS = 207; + private static final int KEY_RING_LINKED_ID_CERTS = 208; private static final int API_APPS = 301; private static final int API_APPS_BY_PACKAGE_NAME = 302; @@ -129,6 +130,8 @@ public class KeychainProvider extends ContentProvider { * key_rings/_/keys * key_rings/_/user_ids * key_rings/_/linked_ids + * key_rings/_/linked_ids/_ + * key_rings/_/linked_ids/_/certs * key_rings/_/public * key_rings/_/secret * key_rings/_/certs @@ -148,6 +151,10 @@ public class KeychainProvider extends ContentProvider { + KeychainContract.PATH_LINKED_IDS, KEY_RING_LINKED_IDS); matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/*/" + + KeychainContract.PATH_LINKED_IDS + "/*/" + + KeychainContract.PATH_CERTS, + KEY_RING_LINKED_ID_CERTS); + matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/*/" + KeychainContract.PATH_PUBLIC, KEY_RING_PUBLIC); matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/*/" |