diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-03 13:06:49 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-06-03 13:06:49 +0200 |
| commit | 84d03dd5142902e013d52dca256d0a66d551ee6e (patch) | |
| tree | 8560088fe57ab8454fa8c35e21bbff7591085fb5 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |
| parent | 39997a802ec2a56039d216cd44c3ec89ab75c1a2 (diff) | |
| parent | 4a47126f05ee53c9d09f46b9445918230937ccf2 (diff) | |
| download | open-keychain-84d03dd5142902e013d52dca256d0a66d551ee6e.tar.gz open-keychain-84d03dd5142902e013d52dca256d0a66d551ee6e.tar.bz2 open-keychain-84d03dd5142902e013d52dca256d0a66d551ee6e.zip | |
Merge pull request #643 from open-keychain/v/dev
wrap bouncycastle objects and don't use them in android-related code
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | 4 |
1 files changed, 2 insertions, 2 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 db2db668d..17c277026 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -419,14 +419,14 @@ public class OpenPgpService extends RemoteService { try { // try to find key, throws NotFoundException if not in db! - mProviderHelper.getPGPPublicKeyRing(masterKeyId); + mProviderHelper.getWrappedPublicKeyRing(masterKeyId); Intent result = new Intent(); result.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS); // also return PendingIntent that opens the key view activity Intent intent = new Intent(getBaseContext(), ViewKeyActivity.class); - intent.setData(KeyRings.buildGenericKeyRingUri(Long.toString(masterKeyId))); + intent.setData(KeyRings.buildGenericKeyRingUri(masterKeyId)); PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0, intent, |