aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2016-05-04 11:36:55 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2016-05-04 11:36:55 +0200
commit4c063ebe4683c0ffd0a80ff617967e8134b484fa (patch)
treed94b0f0892aaf4e9e91b9e917892a26e0e1a620e /OpenKeychain/src/main/java/org/sufficientlysecure
parent20194107e6dbde378a0cbfbd215b31378dffe266 (diff)
downloadopen-keychain-4c063ebe4683c0ffd0a80ff617967e8134b484fa.tar.gz
open-keychain-4c063ebe4683c0ffd0a80ff617967e8134b484fa.tar.bz2
open-keychain-4c063ebe4683c0ffd0a80ff617967e8134b484fa.zip
api: ACTION_GET_KEY selects by any subkey, rather than just master key id
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
index fd58da558..c0343aac6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
@@ -621,7 +621,8 @@ public class OpenPgpService extends Service {
try {
// try to find key, throws NotFoundException if not in db!
CanonicalizedPublicKeyRing keyRing =
- mProviderHelper.getCanonicalizedPublicKeyRing(masterKeyId);
+ mProviderHelper.getCanonicalizedPublicKeyRing(
+ KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(masterKeyId));
Intent result = new Intent();
result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS);