diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-31 23:07:20 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-31 23:07:20 +0200 |
| commit | caad5d1fc15312da3cc665bf7a5c42b64306c140 (patch) | |
| tree | b7c7002df78350d1f345400fdb55729718322b1b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | |
| parent | c5ce794ef782b6809c3f0b3cacfa3bcd6a5a85b7 (diff) | |
| download | open-keychain-caad5d1fc15312da3cc665bf7a5c42b64306c140.tar.gz open-keychain-caad5d1fc15312da3cc665bf7a5c42b64306c140.tar.bz2 open-keychain-caad5d1fc15312da3cc665bf7a5c42b64306c140.zip | |
fix bug in UploadKeyActivity, minor work on uri handling
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index 9b35903f6..75d167d6b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -233,6 +233,12 @@ public class ProviderHelper { } private KeyRing getCanonicalizedKeyRing(Uri queryUri, boolean secret) throws NotFoundException { + + // if this is not a unified query, we /will/ get hard to trace errors below! + if ( ! queryUri.getPath().contains("unified")) { + throw new RuntimeException("only unified uris can be passed to getCanonicalizedKeyRing!"); + } + Cursor cursor = mContentResolver.query(queryUri, new String[]{ // we pick from cache only information that is not easily available from keyrings |