diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-13 14:34:07 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-13 14:34:07 +0100 |
| commit | be3828c89ee7cd4775ba6b442adb59f1007619ca (patch) | |
| tree | f053dba64b60782f39944ec298d4d1627808a019 /OpenPGP-Keychain/src/main/java | |
| parent | 9a1ce093bfadd9de33397f15c39a4c6f52a4abd6 (diff) | |
| download | open-keychain-be3828c89ee7cd4775ba6b442adb59f1007619ca.tar.gz open-keychain-be3828c89ee7cd4775ba6b442adb59f1007619ca.tar.bz2 open-keychain-be3828c89ee7cd4775ba6b442adb59f1007619ca.zip | |
drop unified uri in favor of generic /key_rings
this works well in the uri schema, and we get notifications back with no
effort.
....also remove a line I committed accidentally oO
Diffstat (limited to 'OpenPGP-Keychain/src/main/java')
2 files changed, 10 insertions, 15 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 706b30d05..d9356951e 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 @@ -78,7 +78,6 @@ public class KeychainContract { 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"; @@ -102,7 +101,7 @@ public class KeychainContract { public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.thialfihar.apg.key_ring"; public static Uri buildUnifiedKeyRingsUri() { - return CONTENT_URI.buildUpon().appendPath(PATH_UNIFIED).build(); + return CONTENT_URI; } public static Uri buildPublicKeyRingsUri() { 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 cc08b26bd..1a131a689 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 @@ -97,6 +97,15 @@ public class KeychainProvider extends ContentProvider { String authority = KeychainContract.CONTENT_AUTHORITY; /** + * unified key rings + * + * <pre> + * key_rings + * </pre> + */ + matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS, UNIFIED_KEY_RING); + + /** * public key rings * * <pre> @@ -229,16 +238,6 @@ public class KeychainProvider extends ContentProvider { + KeychainContract.PATH_BY_PACKAGE_NAME + "/*", API_APPS_BY_PACKAGE_NAME); /** - * unified key rings - * <pre> - * - * key_rings/unified - * - */ - matcher.addURI(authority, KeychainContract.BASE_KEY_RINGS + "/" - + KeychainContract.PATH_UNIFIED, UNIFIED_KEY_RING); - - /** * data stream * * <pre> @@ -813,9 +812,6 @@ public class KeychainProvider extends ContentProvider { // notify of changes in db getContext().getContentResolver().notifyChange(uri, null); - getContext().getContentResolver().notifyChange( - KeyRings.buildUnifiedKeyRingsUri().buildUpon().appendPath("lulz").build(), null - ); return count; } |